[DOC] update documentation

[DBUG] correct the basic VPN address
[DEV] specify the network ardress of the docker interface
2019-05-22 22:41:09 +02:00 · 2019-05-22 17:51:14 +02:00 · 2019-05-22 17:50:54 +02:00 · 2019-05-22 17:50:24 +02:00 · 2019-05-22 17:49:57 +02:00 · 2019-05-22 17:49:36 +02:00
40 changed files with 892 additions and 1317 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,22 @@ services:
 before_install:
    - docker --version
-    - docker build -t kylemanna/openvpn .
+
-    - docker inspect kylemanna/openvpn
+install:
-    - docker run kylemanna/openvpn openvpn --version || true # why does it returns 1?
+    - git clone https://github.com/docker-library/official-images.git official-images
-    - docker run kylemanna/openvpn openssl version
+
 # Assist with ci test debugging:
 #   - DEBUG=1
 before_script:
    - image="kylemanna/openvpn"
    - docker build -t "$image" .
    - docker inspect "$image"
    - docker run --rm "$image" openvpn --version || true # why does it return 1?
    - docker run --rm "$image" openssl version
 script:
-    - pushd tests && for i in *.sh; do "./$i"; done && popd
+    - official-images/test/run.sh "$image"
    - test/run.sh "$image"
 after_script:
    - docker images
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,35 +0,0 @@
 # Contributing to docker-openvpn
 Community contributions are welcome and help move the project along.  Please review this document before sending any pull requests.
 Thanks!
 ## Bug Fixes
 All bug fixes are welcome.  Please try to add a test if the bug is something that should have been fixed already.  Oops.
 ## Feature Additions
 New features are welcome provided that the feature has a general audience and is reasonably simple.  The goal of the repository is to support a wide audience and be simple enough.
 Please add new documentation in the `docs` folder for any new features.  Pull requests for missing documentation is welcome as well.  Keep the `README.md` focused on the most popular use case, details belong in the docs directory.
 If you have a special feature, you're likely to try but it will likely be rejected if not too many people seem interested.
 ## Tests
 In an effort to not repeat bugs (and break less popular features), unit tests are run on [Travis CI](https://travis-ci.org/kylemanna/docker-openvpn).  The goal of the tests are to be simple and to be placed in the `tests` directory where it will be automatically run.  Review existing tests for an example.
 ## Style
 The style of the repo follows that of the Linux kernel, in particular:
 * Pull requests should be rebased to small atomic commits so that the merged history is more coherent
 * The subject of the commit should be in the form "<subsystem>: <subject>"
 * More details in the body
 * Match surrounding coding style (line wrapping, spaces, etc)
 More details in the [SubmittingPatches](https://www.kernel.org/doc/Documentation/SubmittingPatches) document included with the Linux kernel.  In particular the following sections:
 * `2) Describe your changes`
 * `3) Separate your changes`
--- a/README.md
+++ b/README.md
@@ -1,191 +1,152 @@
-# OpenVPN for Docker
+OpenVPN for Docker-compose
-
+============================
 [![Build Status](https://travis-ci.org/kylemanna/docker-openvpn.svg)](https://travis-ci.org/kylemanna/docker-openvpn)
 [![Docker Stars](https://img.shields.io/docker/stars/kylemanna/openvpn.svg)](https://hub.docker.com/r/kylemanna/openvpn/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/kylemanna/openvpn.svg)](https://hub.docker.com/r/kylemanna/openvpn/)
 [![ImageLayers Size](https://img.shields.io/imagelayers/image-size/kylemanna/openvpn/latest.svg)](https://hub.docker.com/r/kylemanna/openvpn/)
 [![ImageLayers Layers](https://img.shields.io/imagelayers/layers/kylemanna/openvpn/latest.svg)](https://hub.docker.com/r/kylemanna/openvpn/)
 OpenVPN server in a Docker container complete with an EasyRSA PKI CA.
-Extensively tested on [Digital Ocean $5/mo node](http://bit.ly/1C7cKr3) and has
+Check if your port is availlable
-a corresponding [Digital Ocean Community Tutorial](http://bit.ly/1AGUZkq).
+================================
-#### Upstream Links
+On your server:
 ```{.sh}
 nc -ul -p 1194
 ```
-* Docker Registry @ [kylemanna/openvpn](https://hub.docker.com/r/kylemanna/openvpn/)
+On your computer
-* GitHub @ [kylemanna/docker-openvpn](https://github.com/kylemanna/docker-openvpn)
+```{.sh}
 nc -u __SERVER_IP__ 1194
 ```
 #### Example Service
-* [backroad.io](http://beta.backroad.io?utm_source=kylemanna/openvpn&utm_medium=readme&utm_campaign=20150621) - powered by *kylemanna/openvpn*
+Remove other VPN local:
-## Quick Start
+In case an other service is started :
 ```
 sudo systemctl stop openvpn@server.service
 ```
 * Create the `$OVPN_DATA` volume container, i.e. `OVPN_DATA="ovpn-data"`
-        docker run --name $OVPN_DATA -v /etc/openvpn busybox
+Quick Start with docker-compose
 ================================
-* Initialize the `$OVPN_DATA` container that will hold the configuration files and certificates
+```{.sh}
 docker-compose run --rm openvpn_service ovpn_genconfig -u udp://____VPN.SERVERNAME.COM____
 docker-compose run --rm openvpn_service ovpn_initpki
 ```
-        docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
+or
        docker run --volumes-from $OVPN_DATA --rm -it kylemanna/openvpn ovpn_initpki
-* Start OpenVPN server process
+```{.sh}
 docker-compose run --rm openvpn_service ovpn_genconfig -u udp://____VPN.SERVERNAME.COM____ -b -D -C AES-256-CBC -p ____LOCAL_IP_SERVER____/32 -R -V -F
 docker-compose run --rm openvpn_service ovpn_initpki
 ```
-    - On Docker [version 1.2](http://blog.docker.com/2014/08/announcing-docker-1-2-0/) and newer
+**Note:** the ```-d``` create some errors
            docker run --volumes-from $OVPN_DATA -d -p 1194:1194/udp --cap-add=NET_ADMIN kylemanna/openvpn
-    - On Docker older than version 1.2
+With a teltonika routeur, you need to add the interface of the docker:
 ```
 -p "route 10.3.1.0 255.255.255.0"
 ```
            docker run --volumes-from $OVPN_DATA -d -p 1194:1194/udp --privileged kylemanna/openvpn
 * Generate a client certificate without a passphrase
-        docker run --volumes-from $OVPN_DATA --rm -it kylemanna/openvpn easyrsa build-client-full CLIENTNAME nopass
+Fix ownership (depending on how to handle your backups, this may not be needed)
 ---------------------------------------------------------------------------------
-* Retrieve the client configuration with embedded certificates
+```{.sh}
 sudo chown -R $(whoami): ./openvpn-data
 ```
-        docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_getclient CLIENTNAME > CLIENTNAME.ovpn
+Start OpenVPN server process
 ----------------------------
-## Debugging Tips
+```{.sh}
 docker-compose up -d openvpn_service
 ```
 You can access the container logs with
 --------------------------------------
 ```{.sh}
 docker-compose logs -f
 ```
 Generate a client certificate
 -----------------------------
 ```{.sh}
 export CLIENT_NAME="your_client_name"
 # with a passphrase (recommended)
 docker-compose run --rm openvpn easyrsa build-client-full $CLIENT_NAME
 # without a passphrase (not recommended)
 docker-compose run --rm openvpn easyrsa build-client-full $CLIENT_NAME nopass
 ```
 Add toute too the client:
 ```
 echo "route 10.10.1.0 255.255.255.0" >> openvpn-data/conf/openvpn.conf
 echo "iroute 10.10.1.0 255.255.255.0" > openvpn-data/conf/ccd/$CLIENT_NAME
 ```
 Retrieve the client configuration with embedded certificates
 ------------------------------------------------------------
 In a single file:
 ```{.sh}
 # if the container is down
 docker-compose run --rm openvpn_service ovpn_getclient $CLIENT_NAME > $CLIENT_NAME.ovpn
 # if the container is up
 docker-compose exec openvpn_service ovpn_getclient $CLIENT_NAME > $CLIENT_NAME.ovpn
 ```
 In multiple files
 ```{.sh}
 # if the container is down
 docker-compose run --rm openvpn_service ovpn_getclient $CLIENT_NAME separated
 # if the container is up
 docker-compose exec openvpn_service ovpn_getclient $CLIENT_NAME separated
 ```
 Revoke a client certificate
 ---------------------------
 ```{.sh}
 # Keep the corresponding crt, key and req files.
 docker-compose run --rm openvpn_service ovpn_revokeclient $CLIENT_NAME
 # Remove the corresponding crt, key and req files.
 docker-compose run --rm openvpn_service ovpn_revokeclient $CLIENT_NAME remove
 ```
 Debugging Tips
 --------------
 * Create an environment variable with the name DEBUG and value of 1 to enable debug output (using "docker -e").
-        docker run --volumes-from $OVPN_DATA -p 1194:1194/udp --privileged -e DEBUG=1 kylemanna/openvpn
+```{.sh}
 docker-compose run -e DEBUG=1 -p 1194:1194/udp openvpn_service
 ```
-* Test using a client that has openvpn installed correctly 
+Test on the client:
 -------------------
-        $ openvpn --config CLIENTNAME.ovpn
+Run in root mode:
 ```
 openvpn --config $CLIENT_NAME.ovpn
 ```
-* Run through a barrage of debugging checks on the client if things don't just work
+you can test the connection with the server:
 ```
 ping ____LOCAL_IP_SERVER____
 ```
-        $ ping 8.8.8.8    # checks connectivity without touching name resolution
+On server test the Connectionwith the client:
-        $ dig google.com  # won't use the search directives in resolv.conf
+```
-        $ nslookup google.com # will use search
+ping ____CLIENT_IP_SERVER____
 ```
-## How Does It Work?
+If needed add the routing rules on the server:
 ```
 ip route add 10.10.0.0/16 via 10.3.0.2
 ```
 Initialize the volume container using the `kylemanna/openvpn` image with the
 included scripts to automatically generate:
 - Diffie-Hellman parameters
 - a private key
 - a self-certificate matching the private key for the OpenVPN server
 - an EasyRSA CA key and certificate
 - a TLS auth key from HMAC security
 The OpenVPN server is started with the default run cmd of `ovpn_run`
 The configuration is located in `/etc/openvpn`, and the Dockerfile
 declares that directory as a volume. It means that you can start another
 container with the `--volumes-from` flag, and access the configuration.
 The volume also holds the PKI keys and certs so that it could be backed up.
 To generate a client certificate, `kylemanna/openvpn` uses EasyRSA via the
 `easyrsa` command in the container's path.  The `EASYRSA_*` environmental
 variables place the PKI CA under `/etc/opevpn/pki`.
 Conveniently, `kylemanna/openvpn` comes with a script called `ovpn_getclient`,
 which dumps an inline OpenVPN client configuration file.  This single file can
 then be given to a client for access to the VPN.
 To enable Two Factor Authentication for clients (a.k.a. OTP) see [this document](/docs/otp.md).
 ## OpenVPN Details
 We use `tun` mode, because it works on the widest range of devices.
 `tap` mode, for instance, does not work on Android, except if the device
 is rooted.
 The topology used is `net30`, because it works on the widest range of OS.
 `p2p`, for instance, does not work on Windows.
 The UDP server uses`192.168.255.0/24` for dynamic clients by default.
 The client profile specifies `redirect-gateway def1`, meaning that after
 establishing the VPN connection, all traffic will go through the VPN.
 This might cause problems if you use local DNS recursors which are not
 directly reachable, since you will try to reach them through the VPN
 and they might not answer to you. If that happens, use public DNS
 resolvers like those of Google (8.8.4.4 and 8.8.8.8) or OpenDNS
 (208.67.222.222 and 208.67.220.220).
 ## Security Discussion
 The Docker container runs its own EasyRSA PKI Certificate Authority.  This was
 chosen as a good way to compromise on security and convenience.  The container
 runs under the assumption that the OpenVPN container is running on a secure
 host, that is to say that an adversary does not have access to the PKI files
 under `/etc/openvpn/pki`.  This is a fairly reasonable compromise because if an
 adversary had access to these files, the adversary could manipulate the
 function of the OpenVPN server itself (sniff packets, create a new PKI CA, MITM
 packets, etc).
 * The certificate authority key is kept in the container by default for
  simplicity.  It's highly recommended to secure the CA key with some
  passphrase to protect against a filesystem compromise.  A more secure system
  would put the EasyRSA PKI CA on an offline system (can use the same Docker
  image and the script [`ovpn_copy_server_files`](/docs/paranoid.md) to accomplish this).
 * It would be impossible for an adversary to sign bad or forged certificates
  without first cracking the key's passphase should the adversary have root
  access to the filesystem.
 * The EasyRSA `build-client-full` command will generate and leave keys on the
  server, again possible to compromise and steal the keys.  The keys generated
  need to be signed by the CA which the user hopefully configured with a passphrase
  as described above.
 * Assuming the rest of the Docker container's filesystem is secure, TLS + PKI
  security should prevent any malicious host from using the VPN.
 ## Benefits of Running Inside a Docker Container
 ### The Entire Daemon and Dependencies are in the Docker Image
 This means that it will function correctly (after Docker itself is setup) on
 all distributions Linux distributions such as: Ubuntu, Arch, Debian, Fedora,
 etc.  Furthermore, an old stable server can run a bleeding edge OpenVPN server
 without having to install/muck with library dependencies (i.e. run latest
 OpenVPN with latest OpenSSL on Ubuntu 12.04 LTS).
 ### It Doesn't Stomp All Over the Server's Filesystem
 Everything for the Docker container is contained in two images: the ephemeral
 run time image (kylemanna/openvpn) and the data image (using busybox as a
 base).  To remove it, remove the two Docker images and corresponding containers
 and it's all gone.  This also makes it easier to run multiple servers since
 each lives in the bubble of the container (of course multiple IPs or separate
 ports are needed to communicate with the world).
 ### Some (arguable) Security Benefits
 At the simplest level compromising the container may prevent additional
 compromise of the server.  There are many arguments surrounding this, but the
 take away is that it certainly makes it more difficult to break out of the
 container.  People are actively working on Linux containers to make this more
 of a guarantee in the future.
 ## Differences from jpetazzo/dockvpn
 * No longer uses serveconfig to distribute the configuration via https
 * Proper PKI support integrated into image
 * OpenVPN config files, PKI keys and certs are stored on a storage
  volume for re-use across containers
 * Addition of tls-auth for HMAC security
 ## Tested On
 * Docker hosts:
  * server a [Digital Ocean](https://www.digitalocean.com/?refcode=d19f7fe88c94) Droplet with 512 MB RAM running Ubuntu 14.04
 * Clients
  * Android App OpenVPN Connect 1.1.14 (built 56)
     * OpenVPN core 3.0 android armv7a thumb2 32-bit
  * OS X Mavericks with Tunnelblick 3.4beta26 (build 3828) using openvpn-2.3.4
  * ArchLinux OpenVPN pkg 2.3.4-1
  * 
 ## Having permissions issues with Selinux enabled?
 See [this](docs/selinux.md)
--- a/bin/ovpn_genconfig
+++ b/bin/ovpn_genconfig
@@ -1,266 +0,0 @@
 #!/bin/bash
 #
 # Generate OpenVPN configs
 #
 # Convert 1.2.3.4/24 -> 255.255.255.0
 cidr2mask()
 {
    local i
    local subnetmask=""
    local cidr=${1#*/}
    local full_octets=$(($cidr/8))
    local partial_octet=$(($cidr%8))
    for ((i=0;i<4;i+=1)); do
        if [ $i -lt $full_octets ]; then
            subnetmask+=255
        elif [ $i -eq $full_octets ]; then
            subnetmask+=$((256 - 2**(8-$partial_octet)))
        else
            subnetmask+=0
        fi
        [ $i -lt 3 ] && subnetmask+=.
    done
    echo $subnetmask
 }
 # Used often enough to justify a function
 getroute() {
    echo ${1%/*} $(cidr2mask $1)
 }
 usage() {
    echo "usage: $0 [-d]"
    echo "                  -u SERVER_PUBLIC_URL"
    echo "                 [-s SERVER_SUBNET]"
    echo "                 [-r ROUTE ...]"
    echo "                 [-p PUSH ...]"
    echo "                 [-n DNS_SERVER ...]"
    echo
    echo "optional arguments:"
    echo " -d    Disable NAT routing and default route"
    echo " -c    Enable client-to-client option"
    echo " -D    Do not push dns servers"
    echo " -N    Configure NAT to access external server network"
    echo " -m    Set client MTU"
    echo " -t    Use TAP device (instead of TUN device)"
    echo " -T    Encrypt packets with the given cipher algorithm instead of the default one (tls-cipher)."
    echo " -C    A list of allowable TLS ciphers delimited by a colon (cipher)."
    echo " -a    Authenticate  packets with HMAC using the given message digest algorithm (auth)."
    echo " -z    Enable comp-lzo compression."
    echo " -2    Enable two factor authentication using Google Authenticator."
    echo " -f    Set the fragment directive."
 }
 if [ "$DEBUG" == "1" ]; then
  set -x
 fi
 set -e
 OVPN_ENV=$OPENVPN/ovpn_env.sh
 OVPN_SERVER=192.168.255.0/24
 OVPN_DEFROUTE=1
 OVPN_NAT=0
 OVPN_DNS=1
 OVPN_DEVICE="tun"
 OVPN_DEVICEN=0
 OVPN_ROUTES=()
 TMP_ROUTES=()
 OVPN_PUSH=()
 TMP_PUSH=()
 OVPN_DNS_SERVERS=("8.8.8.8" "8.8.4.4")
 TMP_DNS_SERVERS=()
 OVPN_TLS_CIPHER=''
 OVPN_CIPHER=''
 OVPN_AUTH=''
 # Import defaults if present
 [ -r "$OVPN_ENV" ] && source "$OVPN_ENV"
 # Parse arguments
 while getopts ":a:C:T:r:s:du:cp:n:DNmf:tz2" opt; do
    case $opt in
        a)
            OVPN_AUTH="$OPTARG"
            ;;
        C)
            OVPN_CIPHER="$OPTARG"
            ;;
        T)
            OVPN_TLS_CIPHER="$OPTARG"
            ;;
        r)
            TMP_ROUTES+=("$OPTARG")
            ;;
        s)
            OVPN_SERVER=$OPTARG
            ;;
        d)
            OVPN_DEFROUTE=0
            ;;
        u)
            OVPN_SERVER_URL=$OPTARG
            ;;
        c)
            OVPN_CLIENT_TO_CLIENT=1
            ;;
        p)
            TMP_PUSH+=("$OPTARG")
            ;;
        n)
            TMP_DNS_SERVERS+=("$OPTARG")
            ;;
        D)
            OVPN_DNS=0
            ;;
        N)
            OVPN_NAT=1
            ;;
        m)
            OVPN_MTU=$OPTARG
            ;;
        t)
            OVPN_DEVICE="tap"
            ;;
        z)
            OVPN_COMP_LZO=1
            ;;
        2)
            OVPN_OTP_AUTH=1
            ;;
        f)
            OVPN_FRAGMENT=$OPTARG
            ;;
        \?)
            set +x
            echo "Invalid option: -$OPTARG" >&2
            usage
            exit 1
            ;;
        :)
            set +x
            echo "Option -$OPTARG requires an argument." >&2
            usage
            exit 1
            ;;
    esac
 done
 # if new routes were not defined with -r, use default
 [ ${#TMP_ROUTES[@]} -gt 0 ] && OVPN_ROUTES=("${TMP_ROUTES[@]}")
 # if new push directives were not defined with -p, use default
 [ ${#TMP_PUSH[@]} -gt 0 ] && OVPN_PUSH=("${TMP_PUSH[@]}")
 # if dns servers were not defined with -n, use google nameservers
 [ ${#TMP_DNS_SERVERS[@]} -gt 0 ] && OVPN_DNS_SERVERS=("${TMP_DNS_SERVERS[@]}")
 # Server name is in the form "udp://vpn.example.com:1194"
 if [[ "$OVPN_SERVER_URL" =~ ^((udp|tcp)://)?([0-9a-zA-Z\.\-]+)(:([0-9]+))?$ ]]; then
    OVPN_PROTO=${BASH_REMATCH[2]};
    OVPN_CN=${BASH_REMATCH[3]};
    OVPN_PORT=${BASH_REMATCH[5]};
 else
    set +x
    echo "Common name not specified, see '-u'"
    usage
    exit 1
 fi
 # Apply defaults
 [ -z "$OVPN_PROTO" ] && OVPN_PROTO=udp
 [ -z "$OVPN_PORT" ] && OVPN_PORT=1194
 [ ${#OVPN_ROUTES[@]} -eq 0 ] && OVPN_ROUTES=("192.168.254.0/24")
 export OVPN_SERVER OVPN_ROUTES OVPN_DEFROUTE
 export OVPN_SERVER_URL OVPN_ENV OVPN_PROTO OVPN_CN OVPN_PORT
 export OVPN_CLIENT_TO_CLIENT OVPN_PUSH OVPN_NAT OVPN_DNS OVPN_MTU OVPN_DEVICE
 export OVPN_TLS_CIPHER OVPN_CIPHER OVPN_AUTH
 export OVPN_COMP_LZO
 export OVPN_OTP_AUTH
 export OVPN_FRAGMENT
 # Preserve config
 if [ -f "$OVPN_ENV" ]; then
    bak_env=$OVPN_ENV.$(date +%s).bak
    echo "Backing up $OVPN_ENV -> $bak_env"
    mv "$OVPN_ENV" "$bak_env"
 fi
 export | grep OVPN_ > "$OVPN_ENV"
 conf=$OPENVPN/openvpn.conf
 if [ -f "$conf" ]; then
    bak=$conf.$(date +%s).bak
    echo "Backing up $conf -> $bak"
    mv "$conf" "$bak"
 fi
 cat > "$conf" <<EOF
 server $(getroute $OVPN_SERVER)
 verb 3
 key $EASYRSA_PKI/private/${OVPN_CN}.key
 ca $EASYRSA_PKI/ca.crt
 cert $EASYRSA_PKI/issued/${OVPN_CN}.crt
 dh $EASYRSA_PKI/dh.pem
 tls-auth $EASYRSA_PKI/ta.key
 key-direction 0
 keepalive 10 60
 persist-key
 persist-tun
 proto $OVPN_PROTO
 # Rely on Docker to do port mapping, internally always 1194
 port 1194
 dev $OVPN_DEVICE$OVPN_DEVICEN
 status /tmp/openvpn-status.log
 user nobody
 group nogroup
 EOF
 [ -n "$OVPN_TLS_CIPHER" ] && echo "tls-cipher $OVPN_TLS_CIPHER" >> "$conf"
 [ -n "$OVPN_CIPHER" ] && echo "cipher $OVPN_CIPHER" >> "$conf"
 [ -n "$OVPN_AUTH" ] && echo "auth $OVPN_AUTH" >> "$conf"
 [ -n "$OVPN_CLIENT_TO_CLIENT" ] && echo "client-to-client" >> "$conf"
 [ -n "$OVPN_COMP_LZO" ] && echo "comp-lzo" >> "$conf"
 [ -n "$OVPN_FRAGMENT" ] && echo "fragment $OVPN_FRAGMENT" >> "$conf"
 [ "$OVPN_DNS" == "1" ] && for i in "${OVPN_DNS_SERVERS[@]}"; do
  echo "push dhcp-option DNS $i" >> "$conf"
 done
 # Append Routes
 for i in "${OVPN_ROUTES[@]}"; do
    # If user passed "0" skip this, assume no extra routes
    [ "$i" = "0" ] && break;
    echo route $(getroute "$i") >> "$conf"
 done
 # Append push commands
 for i in "${OVPN_PUSH[@]}"; do
    echo push \"$i\" >> "$conf"
 done
 # Optional OTP authentication support
 if [ -n "$OVPN_OTP_AUTH" ]; then
    echo -e "\n\n# Enable OTP+PAM for user authentication" >> "$conf"
    echo "plugin /usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so openvpn" >> "$conf"
 fi
 set +e
 # Clean-up duplicate configs
 if diff -q "$bak_env" "$OVPN_ENV" 2>/dev/null; then
    echo "Removing duplicate back-up: $bak_env"
    rm -fv "$bak_env"
 fi
 if diff -q "$bak" "$conf" 2>/dev/null; then
    echo "Removing duplicate back-up: $bak"
    rm -fv "$bak"
 fi
 echo "Successfully generated config"
--- a/bin/ovpn_run
+++ b/bin/ovpn_run
@@ -1,66 +0,0 @@
 #!/bin/bash
 #
 # Run the OpenVPN server normally
 #
 if [ "$DEBUG" == "1" ]; then
  set -x
 fi
 set -e
 # Build runtime arguments array based on environment
 ARGS=("--config" "$OPENVPN/openvpn.conf")
 source "$OPENVPN/ovpn_env.sh"
 mkdir -p /dev/net
 if [ ! -c /dev/net/tun ]; then
    mknod /dev/net/tun c 10 200
 fi
 if [ -d "$OPENVPN/ccd" ]; then
    ARGS+=("--client-config-dir" "$OPENVPN/ccd")
 fi
 # When using --net=host, use this to specify nat device.
 [ -z "$OVPN_NATDEVICE" ] && OVPN_NATDEVICE=eth0
 # Setup NAT forwarding if requested
 if [ "$OVPN_DEFROUTE" != "0" ] || [ "$OVPN_NAT" == "1" ] ; then
    iptables -t nat -C POSTROUTING -s $OVPN_SERVER -o $OVPN_NATDEVICE -j MASQUERADE || {
      iptables -t nat -A POSTROUTING -s $OVPN_SERVER -o $OVPN_NATDEVICE -j MASQUERADE
    }
    for i in "${OVPN_ROUTES[@]}"; do
        iptables -t nat -C POSTROUTING -s "$i" -o $OVPN_NATDEVICE -j MASQUERADE || {
          iptables -t nat -A POSTROUTING -s "$i" -o $OVPN_NATDEVICE -j MASQUERADE
        }
    done
 fi
 # Use a hacky hardlink as the CRL Needs to be readable by the user/group
 # OpenVPN is running as.  Only pass arguments to OpenVPN if it's found.
 if [ -r "$EASYRSA_PKI/crl.pem" ]; then
    if [ ! -r "$OPENVPN/crl.pem" ]; then
        ln "$EASYRSA_PKI/crl.pem" "$OPENVPN/crl.pem"
        chmod 644 "$OPENVPN/crl.pem"
    fi
    ARGS+=("--crl-verify" "$OPENVPN/crl.pem")
 fi
 ip -6 route show default 2>/dev/null
 if [ $? = 0 ]; then
    echo "Enabling IPv6 Forwarding"
    # If this fails, ensure the docker container is run with --privileged
    # Could be side stepped with `ip netns` madness to drop privileged flag
    sysctl -w net.ipv6.conf.default.forwarding=1 || echo "Failed to enable IPv6 Forwarding default"
    sysctl -w net.ipv6.conf.all.forwarding=1 || echo "Failed to enable IPv6 Forwarding"
 fi
 if [ "$#" -gt 0 ]; then
    exec openvpn "$@"
 else
    exec openvpn ${ARGS[@]}
 fi
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -0,0 +1,20 @@
 version: '3'
 services:
  openvpn_service:
    privileged: true
    cap_add:
     - NET_ADMIN
    build: docker
    container_name: openvpn
    ports:
     - "1194:1194/udp"
    restart: always
    volumes:
     - ./openvpn-data/conf:/etc/openvpn
 networks:
  default:
    ipam:
      driver: default
      config:
        - subnet: 10.3.1.0/30
--- a/docker/11_route_enable.conf
+++ b/docker/11_route_enable.conf
@@ -0,0 +1,2 @@
 # Enable network forwarding
 net.ipv4.ip_forward=1
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,15 +1,15 @@
 # Original credit: https://github.com/jpetazzo/dockvpn
 # Smallest base image
-FROM alpine:3.2
+FROM alpine:latest
-MAINTAINER Kyle Manna <kyle@kylemanna.com>
+LABEL maintainer="Edouard DUPIN <yui.heero@gmail.com>"
-RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community/" >> /etc/apk/repositories && \
+# Testing: pamtester
-    echo "http://dl-4.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \
+RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \
    apk add --update openvpn iptables bash easy-rsa openvpn-auth-pam google-authenticator pamtester && \
    ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \
-    rm -rf /tmp/* /var/tmp/* /var/cache/apk/*
+    rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
 # Needed by scripts
 ENV OPENVPN /etc/openvpn
@@ -17,14 +17,19 @@ ENV EASYRSA /usr/share/easy-rsa
 ENV EASYRSA_PKI $OPENVPN/pki
 ENV EASYRSA_VARS_FILE $OPENVPN/vars
 # Prevents refused client connection because of an expired CRL
 ENV EASYRSA_CRL_DAYS 3650
 VOLUME ["/etc/openvpn"]
 # Internally uses port 1194/udp, remap using `docker run -p 443:1194/tcp`
 EXPOSE 1194/udp
 WORKDIR /etc/openvpn
 CMD ["ovpn_run"]
 ADD ./11_route_enable.conf /etc/sysctl.d/11_route_enable.conf
 RUN sysctl -p /etc/sysctl.d/*
 ADD ./bin /usr/local/bin
 RUN chmod a+x /usr/local/bin/*
--- a/docker/bin/easyrsa_vars
+++ b/docker/bin/easyrsa_vars
--- a/docker/bin/ovpn_copy_server_files
+++ b/docker/bin/ovpn_copy_server_files
@@ -29,13 +29,19 @@ FILES=(
    "pki/dh.pem"
    "pki/ta.key"
    "pki/ca.crt"
    "ccd"
 )
 if [ -f "${OPENVPN}/pki/crl.pem" ]; then
    FILES+=("pki/crl.pem")
 fi
 # Ensure the ccd directory exists, even if empty
 mkdir -p "ccd"
 # rsync isn't available to keep size down
 # cp --parents isn't in busybox version
 # hack the directory structure with tar
 tar cf - -C "${OPENVPN}" "${FILES[@]}" | tar xvf - -C "${TARGET}"
 mkdir -p "$TARGET/ccd"
 echo "Created the openvpn configuration for the server: $TARGET"
--- a/docker/bin/ovpn_genconfig
+++ b/docker/bin/ovpn_genconfig
@@ -0,0 +1,467 @@
 #!/bin/bash
 #
 # Generate OpenVPN configs
 #
 TMP_PUSH_CONFIGFILE=$(mktemp -t vpn_push.XXXXXXX)
 TMP_ROUTE_CONFIGFILE=$(mktemp -t vpn_route.XXXXXXX)
 TMP_EXTRA_CONFIGFILE=$(mktemp -t vpn_extra.XXXXXXX)
 #Traceback on Error and Exit come from https://docwhat.org/tracebacks-in-bash/
 set -eu
 _showed_traceback=f
 traceback() {
 	# Hide the traceback() call.
 	local -i start=$(( ${1:-0} + 1 ))
 	local -i end=${#BASH_SOURCE[@]}
 	local -i i=0
 	local -i j=0
 	echo "Traceback (last called is first):" 1>&2
 	for ((i=${start}; i < ${end}; i++)); do
 		j=$(( $i - 1 ))
 		local function="${FUNCNAME[$i]}"
 		local file="${BASH_SOURCE[$i]}"
 		local line="${BASH_LINENO[$j]}"
 		echo "     ${function}() in ${file}:${line}" 1>&2
 	done
 }
 on_error() {
  local _ec="$?"
  local _cmd="${BASH_COMMAND:-unknown}"
  traceback 1
  _showed_traceback=t
  echo "The command ${_cmd} exited with exit code ${_ec}." 1>&2
 }
 trap on_error ERR
 on_exit() {
  echo "Cleaning up before Exit ..."
  rm -f $TMP_PUSH_CONFIGFILE
  rm -f $TMP_ROUTE_CONFIGFILE
  rm -f $TMP_EXTRA_CONFIGFILE
  local _ec="$?"
  if [[ $_ec != 0 && "${_showed_traceback}" != t ]]; then
    traceback 1
  fi
 }
 trap on_exit EXIT
 # Convert 1.2.3.4/24 -> 255.255.255.0
 cidr2mask()
 {
    local i
    local subnetmask=""
    local cidr=${1#*/}
    local full_octets=$(($cidr/8))
    local partial_octet=$(($cidr%8))
    for ((i=0;i<4;i+=1)); do
        if [ $i -lt $full_octets ]; then
            subnetmask+=255
        elif [ $i -eq $full_octets ]; then
            subnetmask+=$((256 - 2**(8-$partial_octet)))
        else
            subnetmask+=0
        fi
        [ $i -lt 3 ] && subnetmask+=.
    done
    echo $subnetmask
 }
 # Used often enough to justify a function
 getroute() {
    echo ${1%/*} $(cidr2mask $1)
 }
 usage() {
    echo "usage: $0 [-d]"
    echo "                  -u SERVER_PUBLIC_URL"
    echo "                 [-e EXTRA_SERVER_CONFIG ]"
    echo "                 [-E EXTRA_CLIENT_CONFIG ]"
    echo "                 [-f FRAGMENT ]"
    echo "                 [-n DNS_SERVER ...]"
    echo "                 [-p PUSH ...]"
    echo "                 [-r ROUTE ...]"
    echo "                 [-s SERVER_SUBNET]"
    echo
    echo "optional arguments:"
    echo " -2    Enable two factor authentication using Google Authenticator."
    echo " -a    Authenticate  packets with HMAC using the given message digest algorithm (auth)."
    echo " -b    Disable 'push block-outside-dns'"
    echo " -c    Enable client-to-client option"
    echo " -C    A list of allowable TLS ciphers delimited by a colon (cipher)."
    echo " -d    Disable default route"
    echo " -D    Do not push dns servers"
    echo " -k    Set keepalive. Default: '10 120'"
    echo " -m    Set client MTU"
    echo " -N    Configure NAT to access external server network"
    echo " -t    Use TAP device (instead of TUN device)"
    echo " -T    Encrypt packets with the given cipher algorithm instead of the default one (tls-cipher)."
    echo " -z    Enable comp-lzo compression."
    echo " -S    Change status folder. Default '/tmp'."
    echo " -R    Disable the reduce the OpenVPN daemon's privileges after initialization."
    echo " -K    Set a client config directory. Default Disable. Example: 'ccd'."
    echo " -V    Enable the the record of client <-> virtual IP address (store in a config file)."
    echo " -L    Configure log mode: 'disable', 'enable', 'append'. Default 'disable'."
    echo " -F    Enable the notification to the client that the server restarts."
 }
 process_route_config() {
  local ovpn_route_config=''
  ovpn_route_config="$1"
  # If user passed "0" skip this, assume no extra routes
  [[ "$ovpn_route_config" == "0" ]] && break;
  echo "Processing Route Config: '${ovpn_route_config}'"
  [[ -n "$ovpn_route_config" ]] && echo "route $(getroute $ovpn_route_config)" >> "$TMP_ROUTE_CONFIGFILE"
 }
 process_push_config() {
  local ovpn_push_config=''
  ovpn_push_config="$1"
  echo "Processing PUSH Config: '${ovpn_push_config}'"
  [[ -n "$ovpn_push_config" ]] && echo "push \"$ovpn_push_config\"" >> "$TMP_PUSH_CONFIGFILE"
 }
 process_extra_config() {
  local ovpn_extra_config=''
  ovpn_extra_config="$1"
  echo "Processing Extra Config: '${ovpn_extra_config}'"
  [[ -n "$ovpn_extra_config" ]] && echo "$ovpn_extra_config" >> "$TMP_EXTRA_CONFIGFILE"
 }
 if [ "${DEBUG:-}" == "1" ]; then
  set -x
 fi
 set -e
 if [ -z "${OPENVPN:-}" ]; then
  export OPENVPN="$PWD"
 fi
 if [ -z "${EASYRSA_PKI:-}" ]; then
    export EASYRSA_PKI="$OPENVPN/pki"
 fi
 OVPN_AUTH=''
 OVPN_CIPHER=''
 OVPN_CLIENT_TO_CLIENT=''
 OVPN_CN=''
 OVPN_COMP_LZO=0
 OVPN_DEFROUTE=1
 OVPN_DEVICE="tun"
 OVPN_DEVICEN=0
 OVPN_DISABLE_PUSH_BLOCK_DNS=0
 OVPN_DNS=1
 OVPN_DNS_SERVERS=()
 OVPN_ENV=${OPENVPN}/ovpn_env.sh
 OVPN_EXTRA_CLIENT_CONFIG=()
 OVPN_EXTRA_SERVER_CONFIG=()
 OVPN_FRAGMENT=''
 OVPN_KEEPALIVE="10 120"
 OVPN_MTU=''
 OVPN_NAT=0
 OVPN_PORT=''
 OVPN_PROTO=''
 OVPN_PUSH=()
 OVPN_ROUTES=()
 OVPN_SERVER=192.168.200.0/24
 OVPN_SERVER_URL=''
 OVPN_TLS_CIPHER=''
 OVPN_STATUS_PATH='/tmp'
 OVPN_DISABLE_REDUCE_DEAMON_S_PRIVILEGES=0
 OVPN_CLIENT_CONFIG_DIR=''
 OVPN_ENABLE_KEEP_CLIENT_VIRTUAL_IP=0
 OVPN_LOG_MODE="disable"
 OVPN_ENABLE_NOTIFY_SERVER_RESTARTS=0
 # Import existing configuration if present
 [ -r "$OVPN_ENV" ] && source "$OVPN_ENV"
 # Parse arguments
 while getopts ":a:e:E:C:T:r:s:du:bcp:n:k:DNm:f:tz2S:RK:VL:F" opt; do
    case $opt in
        a)
            OVPN_AUTH="$OPTARG"
            ;;
        e)
            mapfile -t TMP_EXTRA_SERVER_CONFIG <<< "$OPTARG"
            for i in "${TMP_EXTRA_SERVER_CONFIG[@]}"; do
              OVPN_EXTRA_SERVER_CONFIG+=("$i")
            done
            ;;
        E)
            mapfile -t TMP_EXTRA_CLIENT_CONFIG <<< "$OPTARG"
            for i in "${TMP_EXTRA_CLIENT_CONFIG[@]}"; do
              OVPN_EXTRA_CLIENT_CONFIG+=("$i")
            done
            ;;
        C)
            OVPN_CIPHER="$OPTARG"
            ;;
        T)
            OVPN_TLS_CIPHER="$OPTARG"
            ;;
        r)
            mapfile -t TMP_ROUTES <<< "$OPTARG"
            for i in "${TMP_ROUTES[@]}"; do
              OVPN_ROUTES+=("$i")
            done
            ;;
        s)
            OVPN_SERVER="$OPTARG"
            ;;
        d)
            OVPN_DEFROUTE=0
            OVPN_DISABLE_PUSH_BLOCK_DNS=1
            ;;
        u)
            OVPN_SERVER_URL="$OPTARG"
            ;;
        b)
            OVPN_DISABLE_PUSH_BLOCK_DNS=1
            ;;
        c)
            OVPN_CLIENT_TO_CLIENT=1
            ;;
        p)
            mapfile -t TMP_PUSH <<< "$OPTARG"
            for i in "${TMP_PUSH[@]}"; do
              OVPN_PUSH+=("$i")
            done
            ;;
        n)
            mapfile -t TMP_DNS_SERVERS <<< "$OPTARG"
            for i in "${TMP_DNS_SERVERS[@]}"; do
              OVPN_DNS_SERVERS+=("$i")
            done
            ;;
        D)
            OVPN_DNS=0
            ;;
        N)
            OVPN_NAT=1
            ;;
        k)
            OVPN_KEEPALIVE="$OPTARG"
            ;;
        m)
            OVPN_MTU="$OPTARG"
            ;;
        t)
            OVPN_DEVICE="tap"
            ;;
        z)
            OVPN_COMP_LZO=1
            ;;
        2)
            OVPN_OTP_AUTH=1
            ;;
        f)
            OVPN_FRAGMENT="$OPTARG"
            ;;
        S)
            OVPN_STATUS_PATH="$OPTARG"
            ;;
        R)
            OVPN_DISABLE_REDUCE_DEAMON_S_PRIVILEGES=1
            ;;
        K)
            OVPN_CLIENT_CONFIG_DIR="$OPTARG"
            ;;
        V)
            OVPN_ENABLE_KEEP_CLIENT_VIRTUAL_IP=1
            ;;
        L)
            OVPN_LOG_MODE="$OPTARG"
            ;;
        F)
            OVPN_ENABLE_NOTIFY_SERVER_RESTARTS=1
            ;;
        \?)
            set +x
            echo "Invalid option: -$OPTARG" >&2
            usage
            exit 1
            ;;
        :)
            set +x
            echo "Option -$OPTARG requires an argument." >&2
            usage
            exit 1
            ;;
    esac
 done
 # Create ccd directory for static routes
 [ ! -d "${OPENVPN:-}/ccd" ] && mkdir -p ${OPENVPN:-}/ccd
 # Server name is in the form "udp://vpn.example.com:1194"
 if [[ "${OVPN_SERVER_URL:-}" =~ ^((udp|tcp|udp6|tcp6)://)?([0-9a-zA-Z\.\-]+)(:([0-9]+))?$ ]]; then
    OVPN_PROTO=${BASH_REMATCH[2]};
    OVPN_CN=${BASH_REMATCH[3]};
    OVPN_PORT=${BASH_REMATCH[5]};
 else
    set +x
    echo "Common name not specified, see '-u'"
    usage
    exit 1
 fi
 # Apply defaults. If dns servers were not defined with -n, use google nameservers
 set +u
 [ -z "$OVPN_DNS_SERVERS" ] && OVPN_DNS_SERVERS=("8.8.8.8" "8.8.4.4")
 [ -z "$OVPN_PROTO" ] && OVPN_PROTO=udp
 [ -z "$OVPN_PORT" ] && OVPN_PORT=1194
 set -u
 [ "${#OVPN_ROUTES[@]}" == "0" ] && [ "$OVPN_DEFROUTE" == "1" ] && OVPN_ROUTES+=("192.168.200.0/24")
 # Preserve config
 if [ -f "$OVPN_ENV" ]; then
    bak_env=$OVPN_ENV.$(date +%s).bak
    echo "Backing up $OVPN_ENV -> $bak_env"
    mv "$OVPN_ENV" "$bak_env"
 fi
 # Save the current OVPN_ vars to the ovpn_env.sh file
 (set | grep '^OVPN_') | while read -r var; do
  echo "declare -x $var"  >> "$OVPN_ENV"
 done
 conf=${OPENVPN:-}/openvpn.conf
 if [ -f "$conf" ]; then
    bak=$conf.$(date +%s).bak
    echo "Backing up $conf -> $bak"
    mv "$conf" "$bak"
 fi
 # Echo extra client configurations
 if [ ${#OVPN_EXTRA_CLIENT_CONFIG[@]} -gt 0 ]; then
  for i in "${OVPN_EXTRA_CLIENT_CONFIG[@]}"; do
    echo "Processing Extra Client Config: $i"
  done
 fi
 cat > "$conf" <<EOF
 server $(getroute $OVPN_SERVER)
 verb 3
 key $EASYRSA_PKI/private/${OVPN_CN}.key
 ca $EASYRSA_PKI/ca.crt
 cert $EASYRSA_PKI/issued/${OVPN_CN}.crt
 dh $EASYRSA_PKI/dh.pem
 tls-auth $EASYRSA_PKI/ta.key
 key-direction 0
 keepalive $OVPN_KEEPALIVE
 persist-key
 persist-tun
 proto $OVPN_PROTO
 # Rely on Docker to do port mapping, internally always 1194
 port 1194
 dev $OVPN_DEVICE$OVPN_DEVICEN
 status $OVPN_STATUS_PATH/openvpn-status.log
 EOF
 if [ "${OVPN_DISABLE_REDUCE_DEAMON_S_PRIVILEGES}" == "1" ]; then
  echo "Disable 'user' and 'group'"
 else
  echo "user nobody" >> "$conf"
  echo "group nogroup" >> "$conf"
 fi
 if [ "${OVPN_DISABLE_PUSH_BLOCK_DNS}" == "1" ]; then
  echo "Disable default push of 'block-outside-dns'"
 else
  process_push_config "block-outside-dns"
 fi
 if [ "${OVPN_CLIENT_CONFIG_DIR}" == "" ]; then
  echo "Disable client config 'client-config-dir'"
 else
  echo "client-config-dir ${OVPN_CLIENT_CONFIG_DIR}" >> "$conf"
 fi
 [ -n "$OVPN_TLS_CIPHER" ] && echo "tls-cipher $OVPN_TLS_CIPHER" >> "$conf"
 [ -n "$OVPN_CIPHER" ] && echo "cipher $OVPN_CIPHER" >> "$conf"
 [ -n "$OVPN_AUTH" ] && echo "auth $OVPN_AUTH" >> "$conf"
 [ -n "${OVPN_CLIENT_TO_CLIENT:-}" ] && echo "client-to-client" >> "$conf"
 [ "$OVPN_COMP_LZO" == "1" ] && echo "comp-lzo" >> "$conf"
 [ "$OVPN_COMP_LZO" == "0" ] && echo "comp-lzo no" >> "$conf"
 [ "$OVPN_ENABLE_KEEP_CLIENT_VIRTUAL_IP" == "1" ] && echo "ifconfig-pool-persist /etc/openvpn/client_vitual_ip.txt" >> "$conf"
 [ "$OVPN_ENABLE_NOTIFY_SERVER_RESTARTS" == "1" ] && echo "explicit-exit-notify 1" >> "$conf"
 if [ "${OVPN_LOG_MODE}" == "enable" ]; then
  echo "log /var/log/openvpn/openvpn.log" >> "$conf"
 else
  if [ "${OVPN_LOG_MODE}" == "append" ]; then
    echo "log-append /var/log/openvpn/openvpn.log" >> "$conf"
  else
    echo "Log file mode is disable"
  fi
 fi
 [ -n "${OVPN_FRAGMENT:-}" ] && echo "fragment $OVPN_FRAGMENT" >> "$conf"
 # Append route commands
 if [ ${#OVPN_ROUTES[@]} -gt 0 ]; then
  for i in "${OVPN_ROUTES[@]}"; do
    process_route_config "$i"
  done
  echo -e "\n### Route Configurations Below" >> "$conf"
  cat $TMP_ROUTE_CONFIGFILE >> "$conf"
 fi
 # Append push commands
 [ "$OVPN_DNS" == "1" ] && for i in "${OVPN_DNS_SERVERS[@]}"; do
  process_push_config "dhcp-option DNS $i"
 done
 if [ "$OVPN_COMP_LZO" == "0" ]; then
    process_push_config "comp-lzo no"
 fi
 [ ${#OVPN_PUSH[@]} -gt 0 ] && for i in "${OVPN_PUSH[@]}"; do
  process_push_config "$i"
 done
 echo -e "\n### Push Configurations Below" >> "$conf"
 cat $TMP_PUSH_CONFIGFILE >> "$conf"
 # Append optional OTP authentication support
 if [ -n "${OVPN_OTP_AUTH:-}" ]; then
    echo -e "\n\n# Enable OTP+PAM for user authentication" >> "$conf"
    echo "plugin /usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so openvpn" >> "$conf"
    echo "reneg-sec 0" >> "$conf"
 fi
 # Append extra server configurations
 if [ ${#OVPN_EXTRA_SERVER_CONFIG[@]} -gt 0 ]; then
  for i in "${OVPN_EXTRA_SERVER_CONFIG[@]}"; do
    process_extra_config "$i"
  done
  echo -e "\n### Extra Configurations Below" >> "$conf"
  cat $TMP_EXTRA_CONFIGFILE >> "$conf"
 fi
 set +e
 # Clean-up duplicate configs
 if diff -q "${bak_env:-}" "$OVPN_ENV" 2>/dev/null; then
    echo "Removing duplicate back-up: $bak_env"
    rm -fv "$bak_env"
 fi
 if diff -q "${bak:-}" "$conf" 2>/dev/null; then
    echo "Removing duplicate back-up: $bak"
    rm -fv "$bak"
 fi
 echo "Successfully generated config"
--- a/docker/bin/ovpn_getclient
+++ b/docker/bin/ovpn_getclient
@@ -37,8 +37,16 @@ nobind
 dev $OVPN_DEVICE
 remote-cert-tls server
-remote $OVPN_CN $OVPN_PORT $OVPN_PROTO
+remote $OVPN_CN $OVPN_PORT $OVPN_PROTO"
-"
+    if [ "$OVPN_PROTO" == "udp6" ]; then
        echo "remote $OVPN_CN $OVPN_PORT udp"
    fi
    if [ "$OVPN_PROTO" == "tcp6" ]; then
        echo "remote $OVPN_CN $OVPN_PORT tcp"
    fi
    for i in "${OVPN_EXTRA_CLIENT_CONFIG[@]}"; do
      echo "$i"
    done
    if [ "$mode" == "combined" ]; then
        echo "
 <key>
@@ -50,10 +58,10 @@ $(openssl x509 -in $EASYRSA_PKI/issued/${cn}.crt)
 <ca>
 $(cat $EASYRSA_PKI/ca.crt)
 </ca>
 key-direction 1
 <tls-auth>
 $(cat $EASYRSA_PKI/ta.key)
 </tls-auth>
 key-direction 1
 "
    elif [ "$mode" == "separated" ]; then
        echo "
@@ -61,7 +69,6 @@ key ${cn}.key
 ca ca.crt
 cert ${cn}.crt
 tls-auth ta.key 1
 $OVPN_ADDITIONAL_CLIENT_CONFIG
 "
    fi
@@ -90,9 +97,13 @@ $OVPN_ADDITIONAL_CLIENT_CONFIG
        echo "auth-nocache"
    fi
-    if [ -n "$OVPN_COMP_LZO" ]; then
+    if [ "$OVPN_COMP_LZO" == "1" ]; then
        echo "comp-lzo"
    fi
    if [ -n "$OVPN_OTP_AUTH" ]; then
        echo reneg-sec 0
    fi
 }
 dir="$OPENVPN/clients/$cn"
@@ -109,12 +120,13 @@ case "$parm" in
        get_client_config "combined"
        ;;
    "combined-save")
        mkdir -p "$dir"
        get_client_config "combined" > "$dir/${cn}-combined.ovpn"
        ;;
    *)
-        echo "This script can produce the client configuration in to formats:" >&2
+        echo "This script can produce the client configuration in two formats:" >&2
        echo "    1. combined (default): All needed configuration and cryptographic material is in one file (Use \"combined-save\" to write the configuration file in the same path as the separated parameter does)." >&2
        echo "    2. separated: Separated files." >&2
-        echo "Please specific one of those options as second parameter." >&2
+        echo "Please specify one of those options as second parameter." >&2
        ;;
 esac
--- a/docker/bin/ovpn_getclient_all
+++ b/docker/bin/ovpn_getclient_all
--- a/docker/bin/ovpn_initpki
+++ b/docker/bin/ovpn_initpki
@@ -24,7 +24,7 @@ easyrsa init-pki
 easyrsa build-ca $nopass
 easyrsa gen-dh
-openvpn --genkey --secret $OPENVPN/pki/ta.key
+openvpn --genkey --secret $EASYRSA_PKI/ta.key
 # Was nice to autoset, but probably a bad idea in practice, users should
 # have to explicitly specify the common name of their server
@@ -38,3 +38,6 @@ openvpn --genkey --secret $OPENVPN/pki/ta.key
 # For a server key with a password, manually init; this is autopilot
 easyrsa build-server-full "$OVPN_CN" nopass
 # Generate the CRL for client/server certificates revocation.
 easyrsa gen-crl
--- a/docker/bin/ovpn_listclients
+++ b/docker/bin/ovpn_listclients
@@ -0,0 +1,54 @@
 #!/bin/bash
 if [ -z "$OPENVPN" ]; then
    export OPENVPN="$PWD"
 fi
 if ! source "$OPENVPN/ovpn_env.sh"; then
    echo "Could not source $OPENVPN/ovpn_env.sh."
    exit 1
 fi
 if [ -z "$EASYRSA_PKI" ]; then
    export EASYRSA_PKI="$OPENVPN/pki"
 fi
 cd "$EASYRSA_PKI"
 if [ -e crl.pem ]; then
    cat ca.crt crl.pem > cacheck.pem
 else
    cat ca.crt > cacheck.pem
 fi
 echo "name,begin,end,status"
 for name in issued/*.crt; do
    path=$name
    begin=$(openssl x509 -noout -startdate -in $path | awk -F= '{ print $2 }')
    end=$(openssl x509 -noout -enddate -in $path | awk -F= '{ print $2 }')
    name=${name%.crt}
    name=${name#issued/}
    if [ "$name" != "$OVPN_CN" ]; then
        # check for revocation or expiration
        command="openssl verify -crl_check -CAfile cacheck.pem $path"
        result=$($command)
        if [ $(echo "$result" | wc -l) == 1 ] && [ "$(echo "$result" | grep ": OK")" ]; then
            status="VALID"
        else
            result=$(echo "$result" | tail -n 1 | grep error | cut -d" " -f2)
            case $result in
                10)
                    status="EXPIRED"
                    ;;
                23)
                    status="REVOKED"
                    ;;
                *)
                    status="INVALID"
            esac
        fi
        echo "$name,$begin,$end,$status"
    fi
 done
 # Clean
 rm cacheck.pem
--- a/docker/bin/ovpn_otp_user
+++ b/docker/bin/ovpn_otp_user
--- a/docker/bin/ovpn_revokeclient
+++ b/docker/bin/ovpn_revokeclient
@@ -0,0 +1,61 @@
 #!/bin/bash
 #
 # Revoke a client certificate
 #
 if [ "$DEBUG" == "1" ]; then
    set -x
 fi
 set -e
 if [ -z "$OPENVPN" ]; then
    export OPENVPN="$PWD"
 fi
 if ! source "$OPENVPN/ovpn_env.sh"; then
    echo "Could not source $OPENVPN/ovpn_env.sh."
    exit 1
 fi
 if [ -z "$EASYRSA_PKI" ]; then
    export EASYRSA_PKI="$OPENVPN/pki"
 fi
 cn="$1"
 parm="$2"
 if [ ! -f "$EASYRSA_PKI/private/${cn}.key" ]; then
    echo "Unable to find \"${cn}\", please try again or generate the key first" >&2
    exit 1
 fi
 revoke_client_certificate(){
    easyrsa revoke "$1"
    echo "Generating the Certificate Revocation List :"
    easyrsa gen-crl
    cp -f "$EASYRSA_PKI/crl.pem" "$OPENVPN/crl.pem"
    chmod 644 "$OPENVPN/crl.pem"
 }
 remove_files(){
    rm -v "$EASYRSA_PKI/issued/${1}.crt"
    rm -v "$EASYRSA_PKI/private/${1}.key"
    rm -v "$EASYRSA_PKI/reqs/${1}.req"
 }
 case "$parm" in
    "remove")
        revoke_client_certificate "$cn"
        remove_files "$cn"
        ;;
    "" | "keep")
        revoke_client_certificate "$cn"
        ;;
    *)
        echo "When revoking a client certificate, this script let you choose if you want to remove the corresponding crt, key and req files." >&2
        echo "Pease note that the removal of those files is required if you want to generate a new client certificate using the revoked certificate's CN." >&2
        echo "    1. keep (default): Keep the files." >&2
        echo "    2. remove: Remove the files." >&2
        echo "Please specify one of those options as second parameter." >&2
        ;;
 esac
--- a/docker/bin/ovpn_run
+++ b/docker/bin/ovpn_run
@@ -0,0 +1,107 @@
 #!/bin/bash
 #
 # Run the OpenVPN server normally
 #
 if [ "$DEBUG" == "1" ]; then
  set -x
 fi
 set -e
 cd $OPENVPN
 # Build runtime arguments array based on environment
 USER_ARGS=("${@}")
 ARGS=()
 # Checks if ARGS already contains the given value
 function hasArg {
    local element
    for element in "${@:2}"; do
        [ "${element}" == "${1}" ] && return 0
    done
    return 1
 }
 # Adds the given argument if it's not already specified.
 function addArg {
    local arg="${1}"
    [ $# -ge 1 ] && local val="${2}"
    if ! hasArg "${arg}" "${USER_ARGS[@]}"; then
        ARGS+=("${arg}")
        [ $# -ge 1 ] && ARGS+=("${val}")
    fi
 }
 # set up iptables rules and routing
 # this allows rules/routing to be altered by supplying this function
 # in an included file, such as ovpn_env.sh
 function setupIptablesAndRouting {
    iptables -t nat -C POSTROUTING -s $OVPN_SERVER -o $OVPN_NATDEVICE -j MASQUERADE || {
      iptables -t nat -A POSTROUTING -s $OVPN_SERVER -o $OVPN_NATDEVICE -j MASQUERADE
    }
    for i in "${OVPN_ROUTES[@]}"; do
        iptables -t nat -C POSTROUTING -s "$i" -o $OVPN_NATDEVICE -j MASQUERADE || {
          iptables -t nat -A POSTROUTING -s "$i" -o $OVPN_NATDEVICE -j MASQUERADE
        }
    done
 }
 addArg "--config" "$OPENVPN/openvpn.conf"
 source "$OPENVPN/ovpn_env.sh"
 mkdir -p /dev/net
 if [ ! -c /dev/net/tun ]; then
    mknod /dev/net/tun c 10 200
 fi
 if [ -d "$OPENVPN/ccd" ]; then
    addArg "--client-config-dir" "$OPENVPN/ccd"
 fi
 # When using --net=host, use this to specify nat device.
 [ -z "$OVPN_NATDEVICE" ] && OVPN_NATDEVICE=eth0
 # Setup NAT forwarding if requested
 if [ "$OVPN_DEFROUTE" != "0" ] || [ "$OVPN_NAT" == "1" ] ; then
 	# call function to setup iptables rules and routing
 	# this allows rules to be customized by supplying
 	# a replacement function in, for example, ovpn_env.sh
 	setupIptablesAndRouting
 fi
 # Use a copy of crl.pem as the CRL Needs to be readable by the user/group
 # OpenVPN is running as.  Only pass arguments to OpenVPN if it's found.
 if [ "$EASYRSA_PKI/crl.pem" -nt "$OPENVPN/crl.pem" ]; then
    cp -f "$EASYRSA_PKI/crl.pem" "$OPENVPN/crl.pem"
    chmod 644 "$OPENVPN/crl.pem"
 fi
 if [ -r "$OPENVPN/crl.pem" ]; then
    addArg "--crl-verify" "$OPENVPN/crl.pem"
 fi
 # If this fails, ensure the docker container is run with --privileged
 # Could be side stepped with `ip netns` madness to drop privileged flag
 echo "Enabling IPv4 Forwarding"
 sysctl -w net.ipv4.ip_forward=1 || echo "Failed to enable IPv4 forwarding"
 ip -6 route show default 2>/dev/null
 if [ $? = 0 ]; then
    echo "Enabling IPv6 Forwarding"
    # If this fails, ensure the docker container is run with --privileged
    # Could be side stepped with `ip netns` madness to drop privileged flag
    sysctl -w net.ipv6.conf.all.disable_ipv6=0 || echo "Failed to enable IPv6 support"
    sysctl -w net.ipv6.conf.default.forwarding=1 || echo "Failed to enable IPv6 Forwarding default"
    sysctl -w net.ipv6.conf.all.forwarding=1 || echo "Failed to enable IPv6 Forwarding"
 fi
 echo "Running 'openvpn ${ARGS[@]} ${USER_ARGS[@]}'"
 exec openvpn ${ARGS[@]} ${USER_ARGS[@]}
--- a/docker/bin/ovpn_status
+++ b/docker/bin/ovpn_status
--- a/docker/otp/openvpn
+++ b/docker/otp/openvpn
@@ -1,6 +1,6 @@
 # Uses google authenticator library as PAM module using a single folder for all users tokens
 # User root is required to stick with an hardcoded user when trying to determine user id and allow unexisting system users
-# See https://github.com/google/google-authenticator/tree/master/libpam#secretpathtosecretfile--usersome-user
+# See https://github.com/google/google-authenticator-libpam#usersome-user
 auth required pam_google_authenticator.so secret=/etc/openvpn/otp/${USER}.google_authenticator user=root
 # Accept any user since we're dealing with virtual users there's no need to have a system account (pam_unix.so)
--- a/docs/advanced.md
+++ b/docs/advanced.md
@@ -1,20 +0,0 @@
 # Advanced Configurations
 The [`ovpn_genconfig`](/bin/ovpn_genconfig) script is intended for simple configurations that apply to the majority of the users.  If your use case isn't general, it likely won't be supported.  This document aims to explain how to work around that.
 ## Create host volume mounts rather than data volumes
 * Refer to the Quick Start document, and substitute `--volumes-from $OVPN_DATA` with `-v /path/on/host/openvpn0:/etc/openvpn`
 * Quick example that is likely to be out of date, but here's how to get started:
        mkdir openvpn0
        cd openvpn0
        docker run --rm -v $PWD:/etc/openvpn kylemanna/openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM:1194
        docker run --rm -v $PWD:/etc/openvpn -it kylemanna/openvpn ovpn_initpki
        vim openvpn.conf
        docker run --rm -v $PWD:/etc/openvpn -it kylemanna/openvpn easyrsa build-client-full CLIENTNAME nopass
        docker run --rm -v $PWD:/etc/openvpn kylemanna/openvpn ovpn_getclient CLIENTNAME > CLIENTNAME.ovpn
 * Start the server with:
        docker run -v $PWD:/etc/openvpn -d -p 1194:1194/udp --privileged kylemanna/openvpn
--- a/docs/backup.md
+++ b/docs/backup.md
@@ -1,20 +0,0 @@
 # Backing Up Configuration and Certificates
 ## Security
 The resulting archive from this backup contains all credential to impersonate the server at a minimum.  If the client's private keys are generated using the EasyRSA utility then it also contains the client certificates that could be used to impersonate said clients.  Most importantly, if the certificate authority key is in this archive (as it is given the quick start directions), then a adversary could generate certificates at will.
 I'd recommend encrypting the archive with something strong (e.g. gpg or openssl + AES).  For the paranoid keep backup offline.  For the [truly paranoid users](/docs/paranoid.md), never keep any keys (i.e. client and certificate authority) in the docker container to begin with :).
 **TL;DR Protect the resulting archive file.  Ensure there is very limited access to it.**
 ## Backup to Archive
    docker run --volumes-from $OVPN_DATA --rm busybox tar -cvf - -C /etc openvpn | xz > openvpn-backup.tar.xz
 ## Restore to New Container
 Assumes an existing container named `$OVPN_DATA` to extract the data over the top.
    xzcat openvpn-backup.tar.xz | docker run --name $OVPN_DATA -v /etc/openvpn -i busybox tar -xvf - -C /etc
--- a/docs/clients.md
+++ b/docs/clients.md
@@ -1,36 +0,0 @@
 # Advanced Client Management
 ## Client Configuration Mode
 The [`ovpn_getclient`](/bin/ovpn_getclient) can produce two different versions of the configuration.
 1. combined (default): All needed configuration and cryptographic material is in one file (Use "combined-save" to write the configuration file in the same path as the separated parameter does).
 2. separated: Separated files.
 Note that some client software might be picky about which configuration format it accepts.
 ## Batch Mode
 If you have more than a few clients, you will want to generate and update your client configuration in batch. For this task the script [`ovpn_getclient_all`](/bin/ovpn_getclient_all) was written, which writes out the configuration for each client to a separate directory called `clients/$cn`.
 Execute the following to generate the configuration for all clients:
    docker run --rm -it --volumes-from $OVPN_DATA --volume /tmp/openvpn_clients:/etc/openvpn/clients kylemanna/openvpn ovpn_getclient_all
 After doing so, you will find the following files in each of the `$cn` directories:
    ca.crt
    $cn-combined.ovpn # Combined configuration file format. If your client recognices this file then only this file is needed.
    $cn.ovpn          # Separated configuration. This configuration file requires the other files ca.crt dh.pem $cn.crt $cn.key ta.key
    $cn.crt
    $cn.key
    ta.key
 ## Revoking Client Certificates
 Revoke `client1`'s certificate and generate the certificate revocation list (CRL):
    docker run --rm -it --volumes-from $OVPN_DATA kylemanna/openvpn easyrsa revoke client1
    docker run --rm -it --volumes-from $OVPN_DATA kylemanna/openvpn easyrsa gen-crl
 The OpenVPN server will read this change every time a client connects (no need to restart server) and deny clients access using revoked certificates.
--- a/docs/debug.md
+++ b/docs/debug.md
@@ -1,39 +0,0 @@
 # Debugging
 Random things I do to debug the containers.
 ## Login Shells
 * Create a shell in the running docker container (aka namespace) with [nsenter](https://github.com/jpetazzo/nsenter)
 * If you don't have nsenter/docker-enter, you can mount the data container and modify it with
        docker run --rm -it --volumes-from $OVPN_DATA kylemanna/openvpn bash -l
 ## Stream OpenVPN Logs
 1. Get the container's name or container ID:
        root@vpn:~/docker-openvpn# docker ps
        CONTAINER ID        IMAGE                      COMMAND             CREATED             STATUS              PORTS                    NAMES
        ed335aaa9b82        kylemanna/openvpn:latest   ovpn_run            5 minutes ago       Up 5 minutes        0.0.0.0:1194->1194/udp   sad_lovelace
 2. Tail the logs:
        root@vpn:~/docker-openvpn# docker logs -f sad_lovelace
        + mkdir -p /dev/net
        + [ ! -c /dev/net/tun ]
        + mknod /dev/net/tun c 10 200
        + [ ! -d /etc/openvpn/ccd ]
        + iptables -t nat -A POSTROUTING -s 192.168.254.0/24 -o eth0 -j MASQUERADE
        + iptables -t nat -A POSTROUTING -s 192.168.255.0/24 -o eth0 -j MASQUERADE
        + conf=/etc/openvpn/openvpn.conf
        + [ ! -s /etc/openvpn/openvpn.conf ]
        + conf=/etc/openvpn/udp1194.conf
        + openvpn --config /etc/openvpn/udp1194.conf
        Tue Jul  1 06:56:48 2014 OpenVPN 2.3.2 x86_64-pc-linux-gnu [SSL (OpenSSL)] [LZO] [EPOLL] [PKCS11] [eurephia] [MH] [IPv6] built on Mar 17 2014
        Tue Jul  1 06:56:49 2014 Diffie-Hellman initialized with 2048 bit key
        Tue Jul  1 06:56:49 2014 Control Channel Authentication: using '/etc/openvpn/pki/ta.key' as a OpenVPN static key file
        Tue Jul  1 06:56:49 2014 Outgoing Control Channel Authentication: Using 160 bit message hash 'SHA1' for HMAC authentication
        Tue Jul  1 06:56:49 2014 Incoming Control Channel Authentication: Using 160 bit message hash 'SHA1' for HMAC authentication
        Tue Jul  1 06:56:49 2014 Socket Buffers: R=[212992->131072] S=[212992->131072]
--- a/docs/docker-openvpn.te
+++ b/docs/docker-openvpn.te
@@ -1,10 +0,0 @@
 module docker-openvpn 1.0;
 require {
 	type svirt_lxc_net_t;
 	class tun_socket create;
 }
 #============= svirt_lxc_net_t ==============
 allow svirt_lxc_net_t self:tun_socket create;
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -1,52 +0,0 @@
 # Install Latest Docker Service
 Docker included with some distributions lags far behind upstream.  This guide aims to provide a quick and reliable way to install or update it.
 It is recommended to use platforms that support systemd as future versions of this docker image may require systemd to help with some tasks:
 * Fedora
 * Debian 8.1+
 ## Debian / Ubuntu
 ### Step 1 — Set Up Docker
 Docker is moving fast and Debian / Ubuntu's long term support (LTS) policy doesn't keep up. To work around this we'll install a PPA that will get us the latest version of Docker. For Debian Jessie users, just install docker.io from jessie-backports.
 Ensure dependencies are installed:
    sudo apt-get update && sudo apt-get install -y apt-transport-https curl
 Add the upstream Docker repository package signing key. The apt-key command uses elevated privileges via sudo, so a password prompt for the user's password may appear:
    curl -L https://get.docker.com/gpg | sudo apt-key add -
 Add the upstream Docker repository to the system list:
    echo deb https://get.docker.io/ubuntu docker main | sudo tee /etc/apt/sources.list.d/docker.list
 Update the package list and install the Docker package:
    sudo apt-get update && sudo apt-get install -y lxc-docker
 Add your user to the `docker` group to enable communication with the Docker daemon as a normal user, where `$USER` is your username. Exit and log in again for the new group to take effect:
    sudo usermod -aG docker $USER
 After **re-logging in** verify the group membership using the id command. The expected response should include docker like the following example:
    uid=1001(test0) gid=1001(test0) groups=1001(test0),27(sudo),999(docker)
 ### Step 2 — Test Docker
 Run a Debian jessie docker container:
    docker run --rm -it debian:jessie bash -l
 Once inside the container you'll see the `root@<container id>:/#` prompt signifying that the current shell is in a Docker container. To confirm that it's different from the host, check the version of Debian running in the container:
    cat /etc/issue.net
 Expected result:
    Debian GNU/Linux 8
--- a/docs/faqs.md
+++ b/docs/faqs.md
@@ -1,20 +0,0 @@
 # Frequently Asked Questions
 ## How do I edit `openvpn.conf`?
 Use a Docker image with a text editor pre-installed (i.e. Ubuntu) and connect the volume container:
    docker run --volumes-from $OVPN_DATA --rm -it ubuntu vi /etc/openvpn/openvpn.conf
 ## Why not keep everything in one image?
 The run-time image (`kylemanna/openvpn`) is intended to be an ephemeral image. Nothing should be saved in it so that it can be re-downloaded and re-run when updates are pushed (i.e. newer version of OpenVPN or even Debian). The data container contains all this data and is attached at run time providing a safe home.
 If it was all in one container, an upgrade would require a few steps to extract all the data, perform some upgrade import, and re-run. This technique is also prone to people losing their EasyRSA PKI when they forget where it was.  With everything in the data container upgrading is as simple as re-running `docker pull kylemanna/openvpn` and then `docker run ... kylemanna/openvpn`.
 ## How do I set up a split tunnel?
 Split tunnels are configurations where only some of the traffic from a client goes to the VPN, with the remainder routed through the normal non-VPN interfaces. You'll want to disable a default route (-d) when you generate the configuration, but still use NAT (-N) to keep network address translation enabled. 
    ovpn_genconfig -N -d ...
--- a/docs/ipv6.md
+++ b/docs/ipv6.md
@@ -1,94 +0,0 @@
 # IPv6 Support
 This is a work in progress, more polish to follow.
 ## Tunnel IPv6 Address To OpenVPN Clients
 This feature is advanced and recommended only for those who already have a functioning IPv4 tunnel and know how IPv6 works.
 Systemd is used to setup a static route and Debian 8.1 or later is recommended as the host distribution.  Others probably work, but haven't been tested.
 ### Step 1 — Setup IPv6 on the Host Machine
 The tutorial uses a free tunnel from [tunnelbroker.net](https://tunnelbroker.net/) to get a /64 and /48 prefix allocated to me.  The tunnel endpoint is less then 3 ms away from Digital Ocean's San Francisco datacenter.
 Place the following in `/etc/network/interfaces`.  Replace `PUBLIC_IP` with your host's public IPv4 address and replace 2001:db8::2 and 2001:db8::1 with the corresponding tunnel endpoints:
    auto he-ipv6
    iface he-ipv6 inet6 v4tunnel
        address 2001:db8::2
        netmask 64
        endpoint 72.52.104.74
        local PUBLIC_IP
        ttl 255
        gateway 2001:db8::1
 Bring the interface up:
    ifup he-ipv6
 Test that IPv6 works on the host:
    ping6 google.com
 If this doesn't work, figure it out.  It may be necessary to add an firewall rule to allow IP protocol 41 through the firewall.
 ### Step 2 — Update Docker's Init To Enable IPv6 Support
 Add the `--ipv6` to the Docker daemon invocation.
 On **Ubuntu** and old versions of Debian Append the `--ipv6` argument to the `DOCKER_OPTS` variable in:
    /etc/default/docker
 On modern **systemd** distributions copy the service file and modify it and reload the service:
    sed -e 's:^\(ExecStart.*\):\1 --ipv6:' /lib/systemd/system/docker.service | tee /etc/systemd/system/docker.service
    systemctl restart docker.service
 ### Step 3 — Setup the systemd Unit File
 Copy the systemd init file from the docker-openvpn /init directory of the repository and install into `/etc/systemd/system/docker-openvpn.service`
    curl -o /etc/systemd/system/docker-openvpn@.service 'https://raw.githubusercontent.com/kylemanna/docker-openvpn/dev/init/docker-openvpn%40.service'
 Edit the file, replace `IP6_PREFIX` value with the value of your /64 prefix.
    vi /etc/systemd/system/docker-openvpn@.service
 Finally, reload systemd so the changes take affect:
    systemctl daemon-reload
 ### Step 4 — Start OpenVPN
 Ensure that OpenVPN has been initialized and configured as described in the top level `README.md`.
 Start the systemd service file specifying the volume container suffix as the instance.  For example, `INSTANCE=test0` has a docker volume container named `ovpn-data-test0` and service will create `ovpn-test0` container:
    systemctl start docker-openvpn@test0
 Verify logs if needed:
    systemctl status docker-openvpn@test0
    docker logs ovpn-test0
 ### Step 4 — Modify Client Config for IPv6 Default Route
 Append the default route for the public Internet:
    echo "route-ipv6 2000::/3" >> clientname.ovpn
 ### Step 5 — Start up Client
 If all went according to plan, then `ping6 2600::` and `ping6 google.com` should work.
 Fire up a web browser and attempt to navigate to [https://ipv6.google.com](https://ipv6.google.com).
 ## Connect to the OpenVPN Server Over IPv6
 Not implemented, yet.
--- a/docs/otp.md
+++ b/docs/otp.md
@@ -1,72 +0,0 @@
 # Using two factor authentication for users
 Instead of relying on complex passwords for client certificates (that usually get written somewhere) this image
 provides support for two factor authentication with OTP devices.
 The most common app that provides OTP generation is Google Authenticator ([iOS](https://itunes.apple.com/it/app/google-authenticator/id388497605?mt=8) and
 [Android](https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=it)) you can download it
 and use this image to generate user configuration.
 ## Usage
 In order to enable two factor authentication the following steps are required.
 * Generate server configuration with `-2` option
        docker run --volumes-from $OVPN_DATA --rm fabn/openvpn ovpn_genconfig -u udp://vpn.example.com -2
 * Generate your client certificate (possibly without a password since you're using OTP)
        docker run --volumes-from $OVPN_DATA --rm -it fabn/openvpn easyrsa build-client-full <user> nopass
 * Generate authentication configuration for your client. -t is needed to show QR code, -i is optional for interactive usage
        docker run --volumes-from $OVPN_DATA --rm -t fabn/openvpn ovpn_otp_user <user>
 The last step will generate OTP configuration for the provided user with the following options
 ```
 google-authenticator --time-based --disallow-reuse --force --rate-limit=3 --rate-time=30 --window-size=3 \
    -l "${1}@${OVPN_CN}" -s /etc/openvpn/otp/${1}.google_authenticator
 ```
 It will also show a shell QR code in terminal you can scan with the Google Authenticator application. It also provides
 a link to a google chart url that will display a QR code for the authentication.
 **Do not share QR code (or generated url) with anyone but final user, that is your second factor for authentication
  that is used to generate OTP codes**
 Here's an example QR code generated for an hypotetical user@example.com user.
 ![Example QR Code](https://www.google.com/chart?chs=200x200&chld=M|0&cht=qr&chl=otpauth://totp/user@example.com%3Fsecret%3DKEYZ66YEXMXDHPH5)
 Generate client configuration for `<user>` and import it in OpenVPN client. On connection it will prompt for user and password.
 Enter your username and a 6 digit code generated by Authenticator app and you're logged in.
 ## TL;DR
 Under the hood this configuration will setup an `openvpn` PAM service configuration (`/etc/pam.d/openvpn`)
 that relies on the awesome [Google Authenticator PAM module](https://github.com/google/google-authenticator).
 In this configuration the `auth` part of PAM flow is managed by OTP codes and the `account` part is not enforced
 because you're likely dealing with virtual users and you do not want to create a system account for every VPN user.
 `ovpn_otp_user` script will store OTP credentials under `/etc/openvpn/otp/<user>.google_authentication`. In this
 way when you take a backup OTP users are included as well.
 Finally it will enable the openvpn plugin `openvpn-plugin-auth-pam.so` in server configuration and append the
 `auth-user-pass` directive in client configuration.
 ## Debug
 If something is not working you can verify your PAM setup with these commands
 ```
 # Start a shell in container
 docker run --volumes-from $OVPN_DATA --rm -it fabn/openvpn bash
 # Then in container install pamtester utility
 apt-get update && apt-get install -y pamtester
 # To check authentication use this command that will prompt for a valid code from Authenticator APP
 pamtester -v openvpn <user> authenticate
 ```
 If you configured everything correctly you should get authenticated by entering a OTP code from the app.
--- a/docs/paranoid.md
+++ b/docs/paranoid.md
@@ -1,32 +0,0 @@
 # Advanced security
 ## Keep the CA root key save
 As mentioned in the [backup section](/docs/backup.md), there are good reasons to not generate the CA and/or leave it on the server. This document describes how you can generate the CA and all your certificates on a secure machine and then copy only the needed files (which never includes the CA root key obviously ;) ) to the server(s) and clients.
 Execute the following commands. Note that you might want to change the volume `$PWD` or use a data docker container for this.
    docker run --net=none --rm -t -i -v $PWD:/etc/openvpn kylemanna/openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
    docker run --net=none --rm -t -i -v $PWD:/etc/openvpn kylemanna/openvpn ovpn_initpki
    docker run --net=none --rm -t -i -v $PWD:/etc/openvpn kylemanna/openvpn ovpn_copy_server_files
 The [`ovpn_copy_server_files`](/bin/ovpn_copy_server_files) script puts all the needed configuration in a subdirectory which defaults to `$OPENVPN/server`. All you need to do now is to copy this directory to the server and you are good to go.
 ## Crypto Hardening
 If you want to select the cyphers used by OpenVPN the following parameters of the `ovpn_genconfig` might interest you:
    -T    Encrypt packets with the given cipher algorithm instead of the default one (tls-cipher).
    -C    A list of allowable TLS ciphers delimited by a colon (cipher).
    -a    Authenticate  packets with HMAC using the given message digest algorithm (auth).
 The following options have been tested successfully:
    docker run --volumes-from $OVPN_DATA --net=none --rm kylemanna/openvpn ovpn_genconfig -C 'AES-256-CBC' -a 'SHA384'
 Changing the `tls-cipher` option seems to be more complicated because some clients (namely NetworkManager in Debian Jessie) seem to have trouble with this. Running `openvpn` manually also did not solve the issue:
    TLS Error: TLS key negotiation failed to occur within 60 seconds (check your network connectivity)
    TLS Error: TLS handshake failed
 Have a look at the [Applied-Crypto-Hardening](https://github.com/BetterCrypto/Applied-Crypto-Hardening/tree/master/src/configuration/VPNs/OpenVPN) project for more examples.
--- a/docs/selinux.md
+++ b/docs/selinux.md
@@ -1,25 +0,0 @@
 # For hosts that use SELinux
 Try this [policy file](docker-openvpn.te)
 Run these commands to compile and load it:
 ```
 checkmodule -M -m -o docker-openvpn.mod docker-openvpn.te
 semodule_package -o docker-openvpn.pp -m docker-openvpn.mod
 sudo semodule -i docker-openvpn.pp
 ```
 Also, some configurations don't allow containers to load kernel modules, so on the host run this:
 ```
 sudo modprobe tun
 ```
 So the container doesn't have to load the `tun` module.
 # Still having issues?
 In January 2016, Fedora based systems got an update that fixed an issue for labeling namespaced net objects under /proc
 to fix, make sure that you have run `sudo dnf update` and you need to reboot to load the new policies
--- a/docs/static-ips.md
+++ b/docs/static-ips.md
@@ -1,24 +0,0 @@
 # Static IP Addresses
 The docker image is setup for static client configuration on the 192.168.254.0/24 subnet.  To use it follow the Quick Start section below.  Note that the IP addresses octets need to be picked special, see [OpenVPN Documentation](https://openvpn.net/index.php/open-source/documentation/howto.html#policy) for more details.
 ## Quick Start
 1. Create a client specific configuration:
        $ echo "ifconfig-push 192.168.254.1 192.168.254.2" | docker run --volumes-from $OVPN_DATA -i --rm kylemanna/openvpn tee /etc/openvpn/ccd/CERT_COMMON_NAME
        ifconfig-push 192.168.254.1 192.168.254.2
 2. Wait for client to reconnect if necessary
 ## Advanced Admin
 Login to the data volume with a `bash` container, note only changes in /etc/openvpn will persist:
    docker run --volumes-from $OVPN_DATA -it --rm kylemanna/openvpn bash -l
 ## Upgrading from Old OpenVPN Configurations
 If you're running an old configuration and need to upgrade it to pull in the ccd directory run the following:
    docker run  --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_genconfig
--- a/docs/tcp.md
+++ b/docs/tcp.md
@@ -1,18 +0,0 @@
 # TCP Protocol
 ## TCP vs. UDP - Pros & Cons
 By default, OpenVPN is configured to use the UDP protocol.  Because UDP incurs minimal protocol overhead (for example, no acknowledgment is required upon successful packet receipt), it can sometimes result in slightly faster throughput.  However, in situations where VPN service is needed over an unreliable connection, the user experience can benefit from the extra diagnostic features of the TCP protocol.
 As an example, users connecting from an airplane wifi network may experience high packet drop rates, where the error detection and sliding window control of TCP can more readily adjust to the inconsistent connection.
 ## Using TCP
 Those requiring TCP connections should initialize the data container by specifying the TCP protocol and port number:
    docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_genconfig -u tcp://VPN.SERVERNAME.COM:443
    docker run --volumes-from $OVPN_DATA --rm -it kylemanna/openvpn ovpn_initpki
 Because the server container always exposes port 1194, regardless of the
 specified protocol, adjust the mapping appropriately:
    docker run --volumes-from $OVPN_DATA -d -p 443:1194/tcp --cap-add=NET_ADMIN kylemanna/openvpn
--- a/init/docker-openvpn@.service
+++ b/init/docker-openvpn@.service
@@ -1,44 +0,0 @@
 [Unit]
 Description=OpenVPN Docker Container
 Documentation=https://github.com/kylemanna/docker-openvpn
 After=network.target docker.socket
 Requires=docker.socket
 [Service]
 RestartSec=10
 Restart=always
 # Modify IP6_PREFIX to match network config
 #Environment="IP6_PREFIX=2001:db8::/64"
 #Environment="ARGS=--config openvpn.conf --server-ipv6 2001:db8::/64"
 Environment="NAME=ovpn-%i"
 Environment="DATA_VOL=ovpn-data-%i"
 Environment="IMG=kylemanna/openvpn:latest"
 Environment="PORT=1194:1194/udp"
 # To override environment variables, use local configuration directory:
 # /etc/systemd/system/docker-openvpn@foo.d/local.conf
 # http://www.freedesktop.org/software/systemd/man/systemd.unit.html
 # Clean-up bad state if still hanging around
 ExecStartPre=-/usr/bin/docker rm -f $NAME
 # Attempt to pull new image for security updates
 ExecStartPre=-/usr/bin/docker pull $IMG
 # IPv6: Ensure forwarding is enabled on host's networking stack (hacky)
 # Would be nice to use systemd-network on the host, but this doens't work
 # http://lists.freedesktop.org/archives/systemd-devel/2015-June/032762.html
 ExecStartPre=/bin/sh -c 'test -z "$IP6_PREFIX" && exit 0; sysctl net.ipv6.conf.all.forwarding=1'
 # Main process
 ExecStart=/usr/bin/docker run --rm --privileged --volumes-from ${DATA_VOL}:ro --name ${NAME} -p ${PORT} ${IMG} ovpn_run $ARGS
 # IPv6: Add static route for IPv6 after it starts up
 ExecStartPost=/bin/sh -c 'test -z "${IP6_PREFIX}" && exit 0; sleep 1; ip route replace ${IP6_PREFIX} via $(docker inspect -f "{{ .NetworkSettings.GlobalIPv6Address }}" $NAME ) dev docker0'
 # IPv6: Clean-up
 ExecStopPost=/bin/sh -c 'test -z "$IP6_PREFIX" && exit 0; ip route del $IP6_PREFIX dev docker0'
 [Install]
 WantedBy=multi-user.target
--- a/init/upstart.init
+++ b/init/upstart.init
@@ -1,8 +0,0 @@
 # Copy to /etc/init/docker-openvpn.conf
 description "Docker container for OpenVPN server"
 start on filesystem and started docker
 stop on runlevel [!2345]
 respawn
 script
  exec docker run --volumes-from ovpn-data --rm -p 1194:1194/udp --cap-add=NET_ADMIN kylemanna/openvpn
 end script
--- a/tests/basic.sh
+++ b/tests/basic.sh
@@ -1,61 +0,0 @@
 #!/bin/bash
 set -ex
 OVPN_DATA=basic-data
 CLIENT=travis-client
 IMG=kylemanna/openvpn
 #
 # Create a docker container with the config data
 #
 docker run --name $OVPN_DATA -v /etc/openvpn busybox
 ip addr ls
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 docker run --volumes-from $OVPN_DATA --rm $IMG ovpn_genconfig -u udp://$SERV_IP
 # nopass is insecure
 docker run --volumes-from $OVPN_DATA --rm -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
 docker run --volumes-from $OVPN_DATA --rm -it $IMG easyrsa build-client-full $CLIENT nopass
 docker run --volumes-from $OVPN_DATA --rm $IMG ovpn_getclient $CLIENT | tee client/config.ovpn
 #
 # Fire up the server
 #
 sudo iptables -N DOCKER
 sudo iptables -I FORWARD -j DOCKER
 # run in shell bg to get logs
 docker run --name "ovpn-test" --volumes-from $OVPN_DATA --rm -p 1194:1194/udp --privileged $IMG &
 #for i in $(seq 10); do
 #    SERV_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}')
 #    test -n "$SERV_IP" && break
 #done
 #sed -ie s:SERV_IP:$SERV_IP:g client/config.ovpn
 #
 # Fire up a client in a container since openvpn is disallowed by Travis-CI, don't NAT
 # the host as it confuses itself:
 # "Incoming packet rejected from [AF_INET]172.17.42.1:1194[2], expected peer address: [AF_INET]10.240.118.86:1194"
 #
 docker run --rm --net=host --privileged --volume $PWD/client:/client $IMG /client/wait-for-connect.sh
 #
 # Client either connected or timed out, kill server
 #
 kill %1
 #
 # Celebrate
 #
 cat <<EOF
 ___________
 < it worked >
 -----------
        \   ^__^
         \  (oo)\_______
            (__)\       )\/\\
                ||----w |
                ||     ||
 EOF
--- a/tests/client/wait-for-connect.sh
+++ b/tests/client/wait-for-connect.sh
@@ -1,35 +0,0 @@
 #!/bin/bash
 set -ex
 OPENVPN_CONFIG=${1:-/client/config.ovpn}
 # Run in background, rely on bash for job management
 openvpn --config "$OPENVPN_CONFIG" --management 127.0.0.1 9999 &
 # Spin waiting for interface to exist signifying connection
 timeout=10
 for i in $(seq $timeout); do
    # Break when connected
    #echo state | busybox nc 127.0.0.1 9999 | grep -q "CONNECTED,SUCCESS" && break;
    # Bash magic for tcp sockets
    if exec 3<>/dev/tcp/127.0.0.1/9999; then
        # Consume all header input
        while read -t 0.1 <&3; do true; done
        echo "state" >&3
        read -t 1 <&3
        echo -n $REPLY | grep -q "CONNECTED,SUCCESS" && break || true
        exec 3>&-
    fi
    # Else sleep
    sleep 1
 done
 if [ $i -ge $timeout ]; then
    echo "Error starting OpenVPN, i=$i, exiting."
    exit 2;
 fi
 # The show is over.
 kill %1
--- a/tests/openvpn_conf_options.test.sh
+++ b/tests/openvpn_conf_options.test.sh
@@ -1,55 +0,0 @@
 #!/bin/bash
 OVPN_DATA=opvn-data
 IMG=kylemanna/openvpn
 # Function to fail
 abort() { cat <<< "$@" 1>&2; exit 1; }
 #
 # Create a docker container with the config data
 #
 sudo docker run --name $OVPN_DATA -v /etc/openvpn busybox
 #
 # Generate openvpn.config file
 #
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 sudo docker run --volumes-from $OVPN_DATA --rm $IMG ovpn_genconfig -u udp://$SERV_IP -f 1400
 #
 # grep for config lines from openvpn.conf
 # add more tests for more configs as required
 #
 # 1. verb config
 CONFIG_REQUIRED_VERB="verb 3"
 CONFIG_MATCH_VERB=$(sudo docker run --rm -it --volumes-from $OVPN_DATA busybox grep verb /etc/openvpn/openvpn.conf)
 # 2. fragment config
 CONFIG_REQUIRED_FRAGMENT="fragment 1400"
 CONFIG_MATCH_FRAGMENT=$(sudo docker run --rm -it --volumes-from $OVPN_DATA busybox grep fragment /etc/openvpn/openvpn.conf)
 #
 # Clean up
 #
 # sudo docker rm -f $OVPN_DATA
 #
 # Tests
 #
 if [[ $CONFIG_MATCH_VERB =~ $CONFIG_REQUIRED_VERB ]]
 then
  echo "==> Config match found: $CONFIG_REQUIRED_VERB == $CONFIG_MATCH_VERB"
 else
  abort "==> Config match not found: $CONFIG_REQUIRED_VERB != $CONFIG_MATCH_VERB"
 fi
 if [[ $CONFIG_MATCH_FRAGMENT =~ $CONFIG_REQUIRED_FRAGMENT ]]
 then
  echo "==> Config match found: $CONFIG_REQUIRED_FRAGMENT == $CONFIG_MATCH_FRAGMENT"
 else
  abort "==> Config match not found: $CONFIG_REQUIRED_FRAGMENT != $CONFIG_MATCH_FRAGMENT"
 fi
--- a/tests/otp.sh
+++ b/tests/otp.sh
@@ -1,81 +0,0 @@
 #!/bin/bash
 set -ex
 OVPN_DATA=basic-data-otp
 CLIENT=travis-client
 IMG=kylemanna/openvpn
 OTP_USER=otp
 # Function to fail
 abort() { cat <<< "$@" 1>&2; exit 1; }
 #
 # Create a docker container with the config data
 #
 docker run --name $OVPN_DATA -v /etc/openvpn busybox
 ip addr ls
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 # Configure server with two factor authentication
 docker run --volumes-from $OVPN_DATA --rm $IMG ovpn_genconfig -u udp://$SERV_IP -2
 # nopass is insecure
 docker run --volumes-from $OVPN_DATA --rm -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
 docker run --volumes-from $OVPN_DATA --rm -it $IMG easyrsa build-client-full $CLIENT nopass
 # Generate OTP credentials for user named test, should return QR code for test user
 docker run --volumes-from $OVPN_DATA --rm -it $IMG ovpn_otp_user $OTP_USER | tee client/qrcode.txt
 # Ensure a chart link is printed in client OTP configuration
 grep 'https://www.google.com/chart' client/qrcode.txt || abort 'Link to chart not generated'
 grep 'Your new secret key is:' client/qrcode.txt || abort 'Secret key is missing'
 # Extract an emergency code from textual output, grepping for line and trimming spaces
 OTP_TOKEN=$(grep -A1 'Your emergency scratch codes are' client/qrcode.txt | tail -1 | tr -d '[[:space:]]')
 # Token should be present
 if [ -z $OTP_TOKEN ]; then
  abort "QR Emergency Code not detected"
 fi
 # Store authentication credentials in config file and tell openvpn to use them
 echo -e "$OTP_USER\n$OTP_TOKEN" > client/credentials.txt
 # Override the auth-user-pass directive to use a credentials file
 docker run --volumes-from $OVPN_DATA --rm $IMG ovpn_getclient $CLIENT | sed 's/auth-user-pass/auth-user-pass \/client\/credentials.txt/' | tee client/config.ovpn
 #
 # Fire up the server
 #
 sudo iptables -N DOCKER || echo 'Firewall already configured'
 sudo iptables -I FORWARD -j DOCKER || echo 'Forward already configured'
 # run in shell bg to get logs
 docker run --name "ovpn-test" --volumes-from $OVPN_DATA --rm -p 1194:1194/udp --privileged $IMG &
 #for i in $(seq 10); do
 #    SERV_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}')
 #    test -n "$SERV_IP" && break
 #done
 #sed -ie s:SERV_IP:$SERV_IP:g client/config.ovpn
 #
 # Fire up a client in a container since openvpn is disallowed by Travis-CI, don't NAT
 # the host as it confuses itself:
 # "Incoming packet rejected from [AF_INET]172.17.42.1:1194[2], expected peer address: [AF_INET]10.240.118.86:1194"
 #
 docker run --rm --net=host --privileged --volume $PWD/client:/client $IMG /client/wait-for-connect.sh
 #
 # Client either connected or timed out, kill server
 #
 kill %1
 #
 # Celebrate
 #
 cat <<EOF
 ___________
 < it worked >
 -----------
        \   ^__^
         \  (oo)\_______
            (__)\       )\/\\
                ||----w |
                ||     ||
 EOF
--- a/tests/paranoid.sh
+++ b/tests/paranoid.sh
@@ -1,22 +0,0 @@
 #!/bin/bash
 set -ex
 IMG=${IMG:-kylemanna/openvpn}
 temp=$(mktemp -d)
 pushd $temp
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 docker run --net=none --rm -t -i -v $PWD:/etc/openvpn $IMG ovpn_genconfig -u udp://$SERV_IP
 docker run --net=none --rm -t -i -v $PWD:/etc/openvpn -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" kylemanna/openvpn ovpn_initpki nopass
 docker run --net=none --rm -t -i -v $PWD:/etc/openvpn $IMG ovpn_copy_server_files
 popd
 # Can't delete the temp directory as docker creates some files as root.
 # Just let it die with the test instance.
 rm -rf $temp || true
		`@@ -0,0 +1,2 @@`
							`# Enable network forwarding`
							`net.ipv4.ip_forward=1`