diff --git a/Dockerfile b/Dockerfile index cb6487b..6712621 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,6 @@ COPY gen_caddyfile_and_start.sh /bin/ VOLUME /root/.caddy -EXPOSE 2018 +EXPOSE 20018 ENTRYPOINT /bin/gen_caddyfile_and_start.sh diff --git a/build.sh b/build.sh index c9eafed..8138fbd 100644 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ set -e docker build -t caddsies . docker run --rm -it \ - -p 2018:2018 \ + -p 20018:20018 \ -v $(pwd)/mnt:/mnt \ -e CADDYFILE=/mnt/caddyfile \ -e STUNFILE=/mnt/stunfile \ diff --git a/overload b/overload index 337753f..e0d51c2 100644 --- a/overload +++ b/overload @@ -10,5 +10,5 @@ key=/etc/stunserver.key CAfile=/etc/stunclient.crt [default] -accept=2018 +accept=20018 connect=2015 diff --git a/test.sh b/test.sh index 22c1af9..8104a39 100644 --- a/test.sh +++ b/test.sh @@ -1,11 +1,11 @@ #! /bin/bash addr="${1:-${addr:-"192.168.0.86:8080/vpntor"}}" -pport="${2:-${pport:-2018}}" +pport="${2:-${pport:-20018}}" proxycacert="--proxy-cacert ./mnt/stunserver.crt" -if ((pport==2018)); then +if ((pport==20018)); then prox="${3:-${prox:-https://localhost}}" else prox="${3:-${prox:-http://localhost}}"