From c63b2d1cd5c125faacae82364996d48981939339 Mon Sep 17 00:00:00 2001 From: Dennis Schwerdel Date: Tue, 16 Feb 2021 22:37:18 +0100 Subject: [PATCH 1/3] Organize contrib folder --- contrib/{ => aws}/WSProxyCloudFormation.yaml | 0 contrib/{ => aws}/common.py | 0 contrib/{ => aws}/example.py | 0 contrib/{ => aws}/measurements/2020-06-08_1.0.0_perf.json | 0 contrib/{ => aws}/measurements/2020-06-08_1.1.0_perf.json | 0 contrib/{ => aws}/measurements/2020-06-08_1.2.0_perf.json | 0 contrib/{ => aws}/measurements/2020-06-08_1.3.0_perf.json | 0 contrib/{ => aws}/measurements/2020-06-08_1.4.0_perf.json | 0 contrib/{ => aws}/measurements/2020-10-28_2.0.0_perf.json | 0 contrib/{ => aws}/measurements/2021-02-06_2.1.0_perf.json | 0 contrib/{ => aws}/performance.py | 0 contrib/{ => aws}/testnet.py | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename contrib/{ => aws}/WSProxyCloudFormation.yaml (100%) rename contrib/{ => aws}/common.py (100%) rename contrib/{ => aws}/example.py (100%) rename contrib/{ => aws}/measurements/2020-06-08_1.0.0_perf.json (100%) rename contrib/{ => aws}/measurements/2020-06-08_1.1.0_perf.json (100%) rename contrib/{ => aws}/measurements/2020-06-08_1.2.0_perf.json (100%) rename contrib/{ => aws}/measurements/2020-06-08_1.3.0_perf.json (100%) rename contrib/{ => aws}/measurements/2020-06-08_1.4.0_perf.json (100%) rename contrib/{ => aws}/measurements/2020-10-28_2.0.0_perf.json (100%) rename contrib/{ => aws}/measurements/2021-02-06_2.1.0_perf.json (100%) rename contrib/{ => aws}/performance.py (100%) rename contrib/{ => aws}/testnet.py (100%) diff --git a/contrib/WSProxyCloudFormation.yaml b/contrib/aws/WSProxyCloudFormation.yaml similarity index 100% rename from contrib/WSProxyCloudFormation.yaml rename to contrib/aws/WSProxyCloudFormation.yaml diff --git a/contrib/common.py b/contrib/aws/common.py similarity index 100% rename from contrib/common.py rename to contrib/aws/common.py diff --git a/contrib/example.py b/contrib/aws/example.py similarity index 100% rename from contrib/example.py rename to contrib/aws/example.py diff --git a/contrib/measurements/2020-06-08_1.0.0_perf.json b/contrib/aws/measurements/2020-06-08_1.0.0_perf.json similarity index 100% rename from contrib/measurements/2020-06-08_1.0.0_perf.json rename to contrib/aws/measurements/2020-06-08_1.0.0_perf.json diff --git a/contrib/measurements/2020-06-08_1.1.0_perf.json b/contrib/aws/measurements/2020-06-08_1.1.0_perf.json similarity index 100% rename from contrib/measurements/2020-06-08_1.1.0_perf.json rename to contrib/aws/measurements/2020-06-08_1.1.0_perf.json diff --git a/contrib/measurements/2020-06-08_1.2.0_perf.json b/contrib/aws/measurements/2020-06-08_1.2.0_perf.json similarity index 100% rename from contrib/measurements/2020-06-08_1.2.0_perf.json rename to contrib/aws/measurements/2020-06-08_1.2.0_perf.json diff --git a/contrib/measurements/2020-06-08_1.3.0_perf.json b/contrib/aws/measurements/2020-06-08_1.3.0_perf.json similarity index 100% rename from contrib/measurements/2020-06-08_1.3.0_perf.json rename to contrib/aws/measurements/2020-06-08_1.3.0_perf.json diff --git a/contrib/measurements/2020-06-08_1.4.0_perf.json b/contrib/aws/measurements/2020-06-08_1.4.0_perf.json similarity index 100% rename from contrib/measurements/2020-06-08_1.4.0_perf.json rename to contrib/aws/measurements/2020-06-08_1.4.0_perf.json diff --git a/contrib/measurements/2020-10-28_2.0.0_perf.json b/contrib/aws/measurements/2020-10-28_2.0.0_perf.json similarity index 100% rename from contrib/measurements/2020-10-28_2.0.0_perf.json rename to contrib/aws/measurements/2020-10-28_2.0.0_perf.json diff --git a/contrib/measurements/2021-02-06_2.1.0_perf.json b/contrib/aws/measurements/2021-02-06_2.1.0_perf.json similarity index 100% rename from contrib/measurements/2021-02-06_2.1.0_perf.json rename to contrib/aws/measurements/2021-02-06_2.1.0_perf.json diff --git a/contrib/performance.py b/contrib/aws/performance.py similarity index 100% rename from contrib/performance.py rename to contrib/aws/performance.py diff --git a/contrib/testnet.py b/contrib/aws/testnet.py similarity index 100% rename from contrib/testnet.py rename to contrib/aws/testnet.py From 8e49311feffce568915846c3f49c8ed79fef93d9 Mon Sep 17 00:00:00 2001 From: Dennis Schwerdel Date: Tue, 16 Feb 2021 22:41:14 +0100 Subject: [PATCH 2/3] Container for asciinema recorder --- contrib/asciinema-recorder/Dockerfile | 9 +++++++++ contrib/asciinema-recorder/config | 3 +++ contrib/asciinema-recorder/record.sh | 6 ++++++ 3 files changed, 18 insertions(+) create mode 100644 contrib/asciinema-recorder/Dockerfile create mode 100644 contrib/asciinema-recorder/config create mode 100755 contrib/asciinema-recorder/record.sh diff --git a/contrib/asciinema-recorder/Dockerfile b/contrib/asciinema-recorder/Dockerfile new file mode 100644 index 0000000..53c152d --- /dev/null +++ b/contrib/asciinema-recorder/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu + +RUN apt-get update && apt-get install -y asciinema +RUN mkdir /root/.asciinema +RUN mkdir /etc/vpncloud + +WORKDIR /data +ADD config /root/.asciinema/config +RUN echo 'PS1="\[\e[00;34m\]\[\e[01;31m\]\u\[\e[00;01;34m\]@\[\e[00;34m\]node\[\e[01;31m\]:\[\e[00;34m\]\w\[\e[01;31m\]> \[\e[00m\]"' >> /root/.bashrc \ No newline at end of file diff --git a/contrib/asciinema-recorder/config b/contrib/asciinema-recorder/config new file mode 100644 index 0000000..5746cd5 --- /dev/null +++ b/contrib/asciinema-recorder/config @@ -0,0 +1,3 @@ +[record] +command = /usr/bin/bash -l +idle_time_limit = 2.5 \ No newline at end of file diff --git a/contrib/asciinema-recorder/record.sh b/contrib/asciinema-recorder/record.sh new file mode 100755 index 0000000..c9d9da4 --- /dev/null +++ b/contrib/asciinema-recorder/record.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -e + +docker build -t asciinema-recorder . +docker run -it --rm --network host -v $(pwd)/../../target/release/:/usr/local/bin/ -v $(pwd):/data asciinema-recorder asciinema "$@" \ No newline at end of file From 3da0d27eb72d64e79fe07df7d8b3aabacd902c4a Mon Sep 17 00:00:00 2001 From: Dennis Schwerdel Date: Wed, 17 Feb 2021 21:18:36 +0100 Subject: [PATCH 3/3] Up deps --- CHANGELOG.md | 4 ++++ Cargo.lock | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e85c4f..afbe865 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ This project follows [semantic versioning](http://semver.org). ### UNRELEASED - [added] Added interactive configuration wizard +- [added] Support for (un-)installation +- [added] Building static binaries - [changed] Restructured example config +- [changed] Changed Rust version to 1.50.0 +- [changed] Updated dependencies ### v2.1.0 (2021-02-06) diff --git a/Cargo.lock b/Cargo.lock index 0312353..07d8967 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,9 +73,9 @@ checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" [[package]] name = "bstr" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" +checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" dependencies = [ "lazy_static", "memchr", @@ -681,9 +681,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] @@ -712,9 +712,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" dependencies = [ "getrandom", ] @@ -755,9 +755,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" dependencies = [ "bitflags", ] @@ -910,9 +910,9 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4b312c3731e3fe78a185e6b9b911a7aa715b8e31cce117975219aab2acf285d" +checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f" dependencies = [ "block-buffer", "cfg-if 1.0.0", @@ -1201,9 +1201,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" dependencies = [ "tinyvec", ]