diff --git a/gen_caddyfile_and_start.sh b/gen_caddyfile_and_start.sh index a8a5e67..419f9c5 100755 --- a/gen_caddyfile_and_start.sh +++ b/gen_caddyfile_and_start.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash CADDYFILE="${CADDYFILE:-/etc/caddy/Caddyfile}" +STUNFILE="${STUNFILE:-/etc/stunfile.conf}" + +STUNSERVERCRT="${STUNSERVERCRT:-/etc/stunserver.crt}" +STUNSERVERKEY="${STUNSERVERKEY:-/etc/stunserver.key}" +STUNCLIENTKEY="${STUNCLIENTCRT:-/etc/stunclient.crt}" + ROOTDIR="${ROOTDIR:-/srv/index}" SITE_ADDRESS="${SITE_ADDRESS:-localhost}" @@ -29,7 +35,13 @@ else generate_caddyfile fi -stunnel /etc/stunfile.conf > /stun-access.log 2>&1 & +cp "$STUNFILE" "${STUNFILE}_overload" +STUNFILE="${STUNFILE}_overload" +sed -i -e 's/.etc.stunserver.crt/'"${STUNSERVERCRT}"'/g' "${STUNFILE}" +sed -i -e 's/.etc.stunserver.key/'"${STUNSERVERKEY}"'/g' "${STUNFILE}" +sed -i -e 's/.etc.stunclient.crt/'"${STUNCLIENTCRT}"'/g' "${STUNFILE}" + +stunnel "${STUNFILE}" > /stun-access.log 2>&1 & $(which caddy) ${CADDY_OPTS} -conf ${CADDYFILE} & pid=$! diff --git a/stunfile b/stunfile index b0f60ca..62dfbbc 100644 --- a/stunfile +++ b/stunfile @@ -2,11 +2,13 @@ foreground=yes output=/stun-access.log +verifyPeer=yes +requireCert=yes + cert=/etc/stunserver.crt key=/etc/stunserver.key CAfile=/etc/stunclient.crt -verifyPeer=yes -requireCert=yes + [default] accept=2018 connect=2015