20018 pls
parent
63dddda80d
commit
f13b8bcd47
|
|
@ -12,6 +12,6 @@ COPY gen_caddyfile_and_start.sh /bin/
|
||||||
|
|
||||||
VOLUME /root/.caddy
|
VOLUME /root/.caddy
|
||||||
|
|
||||||
EXPOSE 2018
|
EXPOSE 20018
|
||||||
|
|
||||||
ENTRYPOINT /bin/gen_caddyfile_and_start.sh
|
ENTRYPOINT /bin/gen_caddyfile_and_start.sh
|
||||||
|
|
|
||||||
2
build.sh
2
build.sh
|
|
@ -5,7 +5,7 @@ set -e
|
||||||
docker build -t caddsies .
|
docker build -t caddsies .
|
||||||
|
|
||||||
docker run --rm -it \
|
docker run --rm -it \
|
||||||
-p 2018:2018 \
|
-p 20018:20018 \
|
||||||
-v $(pwd)/mnt:/mnt \
|
-v $(pwd)/mnt:/mnt \
|
||||||
-e CADDYFILE=/mnt/caddyfile \
|
-e CADDYFILE=/mnt/caddyfile \
|
||||||
-e STUNFILE=/mnt/stunfile \
|
-e STUNFILE=/mnt/stunfile \
|
||||||
|
|
|
||||||
2
overload
2
overload
|
|
@ -10,5 +10,5 @@ key=/etc/stunserver.key
|
||||||
CAfile=/etc/stunclient.crt
|
CAfile=/etc/stunclient.crt
|
||||||
|
|
||||||
[default]
|
[default]
|
||||||
accept=2018
|
accept=20018
|
||||||
connect=2015
|
connect=2015
|
||||||
|
|
|
||||||
4
test.sh
4
test.sh
|
|
@ -1,11 +1,11 @@
|
||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
|
|
||||||
addr="${1:-${addr:-"192.168.0.86:8080/vpntor"}}"
|
addr="${1:-${addr:-"192.168.0.86:8080/vpntor"}}"
|
||||||
pport="${2:-${pport:-2018}}"
|
pport="${2:-${pport:-20018}}"
|
||||||
|
|
||||||
proxycacert="--proxy-cacert ./mnt/stunserver.crt"
|
proxycacert="--proxy-cacert ./mnt/stunserver.crt"
|
||||||
|
|
||||||
if ((pport==2018)); then
|
if ((pport==20018)); then
|
||||||
prox="${3:-${prox:-https://localhost}}"
|
prox="${3:-${prox:-https://localhost}}"
|
||||||
else
|
else
|
||||||
prox="${3:-${prox:-http://localhost}}"
|
prox="${3:-${prox:-http://localhost}}"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue