Merge branch 'hotfix/0.2.2'

This commit is contained in:
Mengdi Gao 2015-11-28 00:44:53 +08:00
commit bd009dc305
2 changed files with 4 additions and 1 deletions

View file

@ -3,7 +3,7 @@ FROM ubuntu:14.04.3
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y upgrade \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install strongswan iptables uuid-runtime \
&& rm -rf /var/lib/apt/lists/* # cache busted 20151028.1
&& rm -rf /var/lib/apt/lists/* # cache busted 20151128.1
RUN rm /etc/ipsec.secrets

View file

@ -32,5 +32,8 @@ iptables -t nat -A POSTROUTING -s 10.8.0.0/16 -o eth0 -j MASQUERADE
SHARED_SECRET="123$(openssl rand -base64 32 2>/dev/null)"
[ -f /etc/ipsec.secrets ] || echo ": PSK \"${SHARED_SECRET}\"" > /etc/ipsec.secrets
# hotfix for https://github.com/gaomd/docker-ikev2-vpn-server/issues/7
rm -f /var/run/starter.charon.pid
# http://wiki.loopop.net/doku.php?id=server:vpn:strongswanonopenvz
/usr/sbin/ipsec start --nofork