diff --git a/Dockerfile b/Dockerfile index 464d8bd..250d8c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:14.04 MAINTAINER Kyle Manna -RUN apt-get install -y openvpn iptables git-core dnsutils +RUN apt-get install -y openvpn iptables git-core # Update checkout to use tags when v3.0 is finally released RUN git clone https://github.com/OpenVPN/easy-rsa.git /usr/local/share/easy-rsa diff --git a/bin/ovpn_init b/bin/ovpn_init index 738975a..5ddce75 100755 --- a/bin/ovpn_init +++ b/bin/ovpn_init @@ -22,13 +22,15 @@ easyrsa build-ca nopass easyrsa gen-dh openvpn --genkey --secret $OPENVPN/pki/ta.key -if [ -z "$cn"]; then - #TODO: Handle IPv6 (when I get a VPS with IPv6)... - ip4=$(dig +short myip.opendns.com @resolver1.opendns.com) - ptr=$(dig +short -x $ip4 | sed -e 's:\.$::') - - [ -n "$ptr" ] && cn=$ptr || cn=$ip4 -fi +# Was nice to autoset, but probably a bad idea in practice, users should +# have to explicitly specify the common name of their server +#if [ -z "$cn"]; then +# #TODO: Handle IPv6 (when I get a VPS with IPv6)... +# ip4=$(dig +short myip.opendns.com @resolver1.opendns.com) +# ptr=$(dig +short -x $ip4 | sed -e 's:\.$::') +# +# [ -n "$ptr" ] && cn=$ptr || cn=$ip4 +#fi echo "$cn" > $OPENVPN/servername