choose config to use by optionally setting environment variable.

This commit is contained in:
Kristian Haugene 2015-05-09 18:59:36 +02:00
parent 50b5aa7d46
commit 6f07f0324b
3 changed files with 17 additions and 23 deletions

View File

@ -25,7 +25,7 @@ RUN apt-get install -y curl
VOLUME /config VOLUME /config
# Add configuration and scripts # Add configuration and scripts
ADD piaconfig/config.ovpn /etc/openvpn/config.ovpn ADD piaconfig/* /etc/openvpn/
ADD piaconfig/ca.crt /etc/openvpn/ca.crt ADD piaconfig/ca.crt /etc/openvpn/ca.crt
ADD piaconfig/crl.pem /etc/openvpn/crl.pem ADD piaconfig/crl.pem /etc/openvpn/crl.pem
ADD transmission/defaultSettings.json /etc/transmission-daemon/settings.json ADD transmission/defaultSettings.json /etc/transmission-daemon/settings.json

View File

@ -1,21 +0,0 @@
client
dev tun
proto udp
remote nl.privateinternetaccess.com 1194
resolv-retry infinite
nobind
persist-key
persist-tun
ca /etc/openvpn/ca.crt
tls-client
remote-cert-tls server
auth-user-pass /config/pia-credentials.txt
comp-lzo
verb 1
reneg-sec 0
crl-verify /etc/openvpn/crl.pem
# OpenVPN control startup and shut down of transmission
script-security 2
up /etc/transmission-daemon/start.sh
down /etc/transmission-daemon/stop.sh

View File

@ -1,3 +1,18 @@
#!/bin/sh #!/bin/sh
exec openvpn --config /etc/openvpn/config.ovpn if [ ! -z "$OPEN_VPN_CONFIG" ]
then
if [ -f /etc/openvpn/"${OPEN_VPN_CONFIG}".ovpn ]
then
echo "Starting OpenVPN using config ${OPEN_VPN_CONFIG}.ovpn"
exec openvpn --config /etc/openvpn/"${OPEN_VPN_CONFIG}".ovpn
else
echo "Supplied config ${OPEN_VPN_CONFIG}.ovpn could not be found."
echo "Using default OpenVPN gateway: Netherlands"
exec openvpn --config /etc/openvpn/Netherlands.ovpn
fi
else
echo "No VPN configuration provided. Using default: Netherlands"
exec openvpn --config /etc/openvpn/Netherlands.ovpn
fi