Add renovate.json

Build older vpn 2.6.5
Try newer ubuntu
2024-09-11 14:04:52 +00:00 · 2024-08-18 22:36:44 +02:00 · 2024-08-18 22:17:59 +02:00 · 2024-08-18 21:52:18 +02:00 · 2024-08-18 21:50:48 +02:00 · 2024-08-18 21:48:06 +02:00
57 changed files with 1791 additions and 382 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,21 +0,0 @@
-# Disallowing packages: openvpn
-# If you require these packages, please review the package approval process at: https://github.com/travis-ci/apt-package-whitelist#package-approval-process
-#addons:
-#    apt:
-#        sources:
-#            - ubuntu-toolchain-r-test
-#        packages:
-#            - openvpn
-
-services:
-    - docker
-
-before_install:
-    - docker --version
-    - docker build -t kylemanna/openvpn .
-    - docker inspect kylemanna/openvpn
-    - docker run kylemanna/openvpn openvpn --version || true # why does it returns 1?
-    - docker run kylemanna/openvpn openssl version
-
-script:
-    - pushd tests && for i in *.sh; do "./$i"; done && popd
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@ -0,0 +1,37 @@
+---
+when:
+  event:
+    - push
+  branch:
+    - main
+
+matrix:
+  TARGET:
+    - openvpn_xor
+    - openvpn
+
+steps:
+  build-${TARGET}:
+    name: Build ${TARGET}
+    image: gitea.badhouseplants.net/badhouseplants/badhouseplants-builder:latest
+    secrets:
+      - gitea_token
+    environment:
+      CONTAINER_REGISTRY: gitea.badhouseplants.net
+    privileged: true
+    depends_on: []
+    backend_options:
+      kubernetes:
+        resources:
+          requests:
+            memory: 1024Mi
+            cpu: 300m
+          limits:
+            memory: 1024Mi
+        securityContext:
+          privileged: true
+        nodeSelector:
+          kubernetes.io/arch: "amd64"
+    commands:
+      - source ./env/${TARGET}.env
+      - ./scripts/$SCRIPT
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -18,18 +18,18 @@ If you have a special feature, you're likely to try but it will likely be reject

 ## 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.
+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 `test/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>"
+* 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:
+More details in the [SubmittingPatches](https://www.kernel.org/doc/html/latest/process/submitting-patches.html) document included with the Linux kernel.  In particular the following sections:

 * `2) Describe your changes`
 * `3) Separate your changes`
--- a/32
+++ b/32
@ -1,32 +0,0 @@
-# Original credit: https://github.com/jpetazzo/dockvpn
-
-# Smallest base image
-FROM alpine:3.2
-
-MAINTAINER Kyle Manna <kyle@kylemanna.com>
-
-RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community/" >> /etc/apk/repositories && \
-    echo "http://dl-4.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/*
-
-# Needed by scripts
-ENV OPENVPN /etc/openvpn
-ENV EASYRSA /usr/share/easy-rsa
-ENV EASYRSA_PKI $OPENVPN/pki
-ENV EASYRSA_VARS_FILE $OPENVPN/vars
-
-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 ./bin /usr/local/bin
-RUN chmod a+x /usr/local/bin/*
-
-# Add support for OTP authentication using a PAM module
-ADD ./otp/openvpn /etc/pam.d/
--- a/Makefile.in
+++ b/Makefile.in
--- a/README.md
+++ b/README.md
@ -1,59 +1,70 @@
 # OpenVPN for Docker

-[![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
-a corresponding [Digital Ocean Community Tutorial](http://bit.ly/1AGUZkq).
+OpenVPN server in a Docker container complete with an EasyRSA PKI CA, with support for the [Tunnelblick obfuscation patch](https://tunnelblick.net/cOpenvpn_xorpatch.html). Based on [kylemanna's docker-openvpn image](https://github.com/kylemanna/docker-openvpn).

 #### Upstream Links

-* Docker Registry @ [kylemanna/openvpn](https://hub.docker.com/r/kylemanna/openvpn/)
-* GitHub @ [kylemanna/docker-openvpn](https://github.com/kylemanna/docker-openvpn)
+* Docker Registry @ [lawtancool/docker-openvpn-xor](https://hub.docker.com/r/lawtancool/docker-openvpn-xor)
+* GitHub @ [lawtancool/docker-openvpn-xor](https://github.com/lawtancool/docker-openvpn-xor)

-#### Example Service
-
-* [backroad.io](http://beta.backroad.io?utm_source=kylemanna/openvpn&utm_medium=readme&utm_campaign=20150621) - powered by *kylemanna/openvpn*
+#### Clients with support for the Tunnelblick obfuscation patch
+* Windows: https://github.com/lawtancool/openvpn-windows-xor
+* Android: https://github.com/lawtancool/ics-openvpn-xor
+* macOS: https://tunnelblick.net/

 ## Quick Start

-* Create the `$OVPN_DATA` volume container, i.e. `OVPN_DATA="ovpn-data"`
+* Pick a name for the `$OVPN_DATA` data volume container. It's recommended to
+  use the `ovpn-data-` prefix to operate seamlessly with the reference systemd
+  service.  Users are encourage to replace `example` with a descriptive name of
+  their choosing.

-        docker run --name $OVPN_DATA -v /etc/openvpn busybox
+      OVPN_DATA="ovpn-data-example"

-* Initialize the `$OVPN_DATA` container that will hold the configuration files and certificates
+* Initialize the `$OVPN_DATA` container that will hold the configuration files
+  and certificates.  The container will prompt for a passphrase to protect the
+  private key used by the newly generated certificate authority.

-        docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
-        docker run --volumes-from $OVPN_DATA --rm -it kylemanna/openvpn ovpn_initpki
+      docker volume create --name $OVPN_DATA
+      docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm lawtancool/docker-openvpn-xor ovpn_genconfig -u udp://VPN.SERVERNAME.COM
+      docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm -it lawtancool/docker-openvpn-xor ovpn_initpki

 * Start OpenVPN server process

-    - On Docker [version 1.2](http://blog.docker.com/2014/08/announcing-docker-1-2-0/) and newer
-
-            docker run --volumes-from $OVPN_DATA -d -p 1194:1194/udp --cap-add=NET_ADMIN kylemanna/openvpn
-
-    - On Docker older than version 1.2
-
-            docker run --volumes-from $OVPN_DATA -d -p 1194:1194/udp --privileged kylemanna/openvpn
+      docker run -v $OVPN_DATA:/etc/openvpn -d -p 1194:1194/udp --cap-add=NET_ADMIN lawtancool/docker-openvpn-xor

 * Generate a client certificate without a passphrase

-        docker run --volumes-from $OVPN_DATA --rm -it kylemanna/openvpn easyrsa build-client-full CLIENTNAME nopass
+      docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm -it lawtancool/docker-openvpn-xor ovpn_genclientcert CLIENTNAME nopass

 * Retrieve the client configuration with embedded certificates

-        docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_getclient CLIENTNAME > CLIENTNAME.ovpn
+      docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm lawtancool/docker-openvpn-xor ovpn_getclient CLIENTNAME > CLIENTNAME.ovpn
+
+## Next Steps
+
+### More Reading
+
+Miscellaneous write-ups for advanced configurations are available in the
+[docs](docs) folder.
+
+### Systemd Init Scripts
+
+A `systemd` init script is available to manage the OpenVPN container.  It will
+start the container on system boot, restart the container if it exits
+unexpectedly, and pull updates from Docker Hub to keep itself up to date.
+
+Please refer to the [systemd documentation](docs/systemd.md) to learn more.
+
+### Docker Compose
+
+If you prefer to use `docker-compose` please refer to the [documentation](docs/docker-compose.md).

 ## 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
+        docker run -v $OVPN_DATA:/etc/openvpn -p 1194:1194/udp --privileged -e DEBUG=1 lawtancool/docker-openvpn-xor

 * Test using a client that has openvpn installed correctly

@ -65,9 +76,13 @@ a corresponding [Digital Ocean Community Tutorial](http://bit.ly/1AGUZkq).
        $ dig google.com  # won't use the search directives in resolv.conf
        $ nslookup google.com # will use search

+* Consider setting up a [systemd service](/docs/systemd.md) for automatic
+  start-up at boot time and restart in the event the OpenVPN daemon or Docker
+  crashes.
+
 ## How Does It Work?

-Initialize the volume container using the `kylemanna/openvpn` image with the
+Initialize the volume container using the `lawtancool/docker-openvpn-xor` image with the
 included scripts to automatically generate:

 - Diffie-Hellman parameters
@ -80,14 +95,14 @@ 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.
+container with the `-v` argument, 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
+To generate a client certificate, `lawtancool/docker-openvpn-xor` uses EasyRSA via the
 `easyrsa` command in the container's path.  The `EASYRSA_*` environmental
-variables place the PKI CA under `/etc/opevpn/pki`.
+variables place the PKI CA under `/etc/openvpn/pki`.

-Conveniently, `kylemanna/openvpn` comes with a script called `ovpn_getclient`,
+Conveniently, `lawtancool/docker-openvpn-xor` 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.

@ -153,11 +168,11 @@ 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).
+run time image (lawtancool/docker-openvpn-xor) and the `$OVPN_DATA` data volume. To remove
+it, remove the corresponding containers, `$OVPN_DATA` data volume and Docker
+image and it's completely removed.  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

@ -175,17 +190,6 @@ of a guarantee in the future.
  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)
+## Differences from kylemanna/openvpn
+* Based on Ubuntu instead of Alpine
+* Compiles OpenVPN 2.5.0 from source, applying the [Tunnelblick obfuscation patches](https://github.com/Tunnelblick/Tunnelblick/tree/master/third_party/sources/openvpn/openvpn-2.5.0/patches)
--- a/bin/ovpn_copy_server_files
+++ b/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/bin/ovpn_genclientcert
+++ b/bin/ovpn_genclientcert
@ -0,0 +1,18 @@
+#!/bin/bash
+
+#
+# Generate a client certificate with EasyRSA
+#
+
+if [ "$DEBUG" == "1" ]; then
+  set -x
+fi
+
+CLIENTNAME=$1
+PASSWORD=$2
+
+set -e
+
+source "$OPENVPN/ovpn_env.sh"
+
+/usr/share/easy-rsa/easyrsa build-client-full $CLIENTNAME $PASSWORD
--- a/bin/ovpn_genconfig
+++ b/bin/ovpn_genconfig
@ -4,6 +4,54 @@
 # 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()
 {
@ -34,58 +82,113 @@ getroute() {
 usage() {
    echo "usage: $0 [-d]"
    echo "                  -u SERVER_PUBLIC_URL"
-    echo "                 [-s SERVER_SUBNET]"
-    echo "                 [-r ROUTE ...]"
-    echo "                 [-p PUSH ...]"
+    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 " -d    Disable NAT routing and default route"
+    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 " -N    Configure NAT to access external server network"
+    echo " -k    Set keepalive. Default: '10 60'"
    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 " -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
+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

-OVPN_ENV=$OPENVPN/ovpn_env.sh
-OVPN_SERVER=192.168.255.0/24
+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_NAT=0
-OVPN_DNS=1
 OVPN_DEVICE="tun"
 OVPN_DEVICEN=0
-OVPN_ROUTES=()
-TMP_ROUTES=()
+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 60"
+OVPN_MTU=''
+OVPN_NAT=0
+OVPN_PORT=''
+OVPN_PROTO=''
 OVPN_PUSH=()
-TMP_PUSH=()
-OVPN_DNS_SERVERS=("8.8.8.8" "8.8.4.4")
-TMP_DNS_SERVERS=()
+OVPN_ROUTES=()
+OVPN_SERVER=192.168.255.0/24
+OVPN_SERVER_URL=''
 OVPN_TLS_CIPHER=''
-OVPN_CIPHER=''
-OVPN_AUTH=''

-# Import defaults if present
+# Import existing configuration if present
 [ -r "$OVPN_ENV" ] && source "$OVPN_ENV"

 # Parse arguments
-while getopts ":a:C:T:r:s:du:cp:n:DNmf:tz2" opt; do
+while getopts ":a:e:E:C:T:r:s:du:bcp:n:k:DNm:f:tz2" 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"
            ;;
@ -93,25 +196,38 @@ while getopts ":a:C:T:r:s:du:cp:n:DNmf:tz2" opt; do
            OVPN_TLS_CIPHER="$OPTARG"
            ;;
        r)
-            TMP_ROUTES+=("$OPTARG")
+            mapfile -t TMP_ROUTES <<< "$OPTARG"
+            for i in "${TMP_ROUTES[@]}"; do
+              OVPN_ROUTES+=("$i")
+            done
            ;;
        s)
-            OVPN_SERVER=$OPTARG
+            OVPN_SERVER="$OPTARG"
            ;;
        d)
            OVPN_DEFROUTE=0
+            OVPN_DISABLE_PUSH_BLOCK_DNS=1
            ;;
        u)
-            OVPN_SERVER_URL=$OPTARG
+            OVPN_SERVER_URL="$OPTARG"
+            ;;
+        b)
+            OVPN_DISABLE_PUSH_BLOCK_DNS=1
            ;;
        c)
            OVPN_CLIENT_TO_CLIENT=1
            ;;
        p)
-            TMP_PUSH+=("$OPTARG")
+            mapfile -t TMP_PUSH <<< "$OPTARG"
+            for i in "${TMP_PUSH[@]}"; do
+              OVPN_PUSH+=("$i")
+            done
            ;;
        n)
-            TMP_DNS_SERVERS+=("$OPTARG")
+            mapfile -t TMP_DNS_SERVERS <<< "$OPTARG"
+            for i in "${TMP_DNS_SERVERS[@]}"; do
+              OVPN_DNS_SERVERS+=("$i")
+            done
            ;;
        D)
            OVPN_DNS=0
@ -119,8 +235,11 @@ while getopts ":a:C:T:r:s:du:cp:n:DNmf:tz2" opt; do
        N)
            OVPN_NAT=1
            ;;
+        k)
+            OVPN_KEEPALIVE="$OPTARG"
+            ;;
        m)
-            OVPN_MTU=$OPTARG
+            OVPN_MTU="$OPTARG"
            ;;
        t)
            OVPN_DEVICE="tap"
@ -132,7 +251,7 @@ while getopts ":a:C:T:r:s:du:cp:n:DNmf:tz2" opt; do
            OVPN_OTP_AUTH=1
            ;;
        f)
-            OVPN_FRAGMENT=$OPTARG
+            OVPN_FRAGMENT="$OPTARG"
            ;;
        \?)
            set +x
@ -149,17 +268,11 @@ while getopts ":a:C:T:r:s:du:cp:n:DNmf:tz2" opt; do
    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[@]}")
+# 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)://)?([0-9a-zA-Z\.\-]+)(:([0-9]+))?$ ]]; then
+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]};
@ -170,18 +283,13 @@ else
    exit 1
 fi

-# Apply defaults
+# 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
-[ ${#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
+set -u
+[ "${#OVPN_ROUTES[@]}" == "0" ] && [ "$OVPN_DEFROUTE" == "1" ] && OVPN_ROUTES+=("192.168.254.0/24")

 # Preserve config
 if [ -f "$OVPN_ENV" ]; then
@ -189,15 +297,26 @@ if [ -f "$OVPN_ENV" ]; then
    echo "Backing up $OVPN_ENV -> $bak_env"
    mv "$OVPN_ENV" "$bak_env"
 fi
-export | grep OVPN_ > "$OVPN_ENV"

-conf=$OPENVPN/openvpn.conf
+# 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
@ -205,9 +324,9 @@ 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
+tls-crypt $EASYRSA_PKI/ta.key
+#key-direction 0
+keepalive $OVPN_KEEPALIVE
 persist-key
 persist-tun

@ -221,44 +340,71 @@ user nobody
 group nogroup
 EOF

+if [ "${OVPN_DISABLE_PUSH_BLOCK_DNS}" == "1" ]; then
+  echo "Disable default push of 'block-outside-dns'"
+else
+  process_push_config "block-outside-dns"
+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"
-[ -n "$OVPN_COMP_LZO" ] && echo "comp-lzo" >> "$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"

-[ -n "$OVPN_FRAGMENT" ] && echo "fragment $OVPN_FRAGMENT" >> "$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
+# Append route commands
+if [ ${#OVPN_ROUTES[@]} -gt 0 ]; then
  for i in "${OVPN_ROUTES[@]}"; do
-    # If user passed "0" skip this, assume no extra routes
-    [ "$i" = "0" ] && break;
-    echo route $(getroute "$i") >> "$conf"
+    process_route_config "$i"
  done
+  echo -e "\n### Route Configurations Below" >> "$conf"
+  cat $TMP_ROUTE_CONFIGFILE >> "$conf"
+fi

 # Append push commands
-for i in "${OVPN_PUSH[@]}"; do
-    echo push \"$i\" >> "$conf"
+[ "$OVPN_DNS" == "1" ] && for i in "${OVPN_DNS_SERVERS[@]}"; do
+  process_push_config "dhcp-option DNS $i"
 done

-# Optional OTP authentication support
-if [ -n "$OVPN_OTP_AUTH" ]; then
+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
+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
+if diff -q "${bak:-}" "$conf" 2>/dev/null; then
    echo "Removing duplicate back-up: $bak"
    rm -fv "$bak"
 fi
--- a/bin/ovpn_getclient
+++ b/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,18 +58,18 @@ $(openssl x509 -in $EASYRSA_PKI/issued/${cn}.crt)
 <ca>
 $(cat $EASYRSA_PKI/ca.crt)
 </ca>
-<tls-auth>
+#key-direction 1
+<tls-crypt>
 $(cat $EASYRSA_PKI/ta.key)
-</tls-auth>
-key-direction 1
+</tls-crypt>
 "
    elif [ "$mode" == "separated" ]; then
        echo "
 key ${cn}.key
 ca ca.crt
 cert ${cn}.crt
-tls-auth ta.key 1
-$OVPN_ADDITIONAL_CLIENT_CONFIG
+tls-crypt ta.key
+#tls-auth ta.key 1
 "
    fi

@ -90,9 +98,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 +121,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/bin/ovpn_initpki
+++ b/bin/ovpn_initpki
@ -15,16 +15,10 @@ source "$OPENVPN/ovpn_env.sh"
 # Specify "nopass" as arg[2] to make the CA insecure (not recommended!)
 nopass=$1

-# Provides a sufficient warning before erasing pre-existing files
-easyrsa init-pki
-
-# CA always has a password for protection in event server is compromised. The
-# password is only needed to sign client/server certificates.  No password is
-# needed for normal OpenVPN operation.
-easyrsa build-ca $nopass
-
-easyrsa gen-dh
-openvpn --genkey --secret $OPENVPN/pki/ta.key
+/usr/share/easy-rsa/easyrsa init-pki
+/usr/share/easy-rsa/easyrsa build-ca $nopass
+/usr/share/easy-rsa/easyrsa gen-dh
+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
@ -37,4 +31,7 @@ openvpn --genkey --secret $OPENVPN/pki/ta.key
 #fi

 # For a server key with a password, manually init; this is autopilot
-easyrsa build-server-full "$OVPN_CN" nopass
+/usr/share/easy-rsa/easyrsa build-server-full "$OVPN_CN" nopass
+
+# Generate the CRL for client/server certificates revocation.
+/usr/share/easy-rsa/easyrsa gen-crl
--- a/bin/ovpn_listclients
+++ b/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/bin/ovpn_revokeclient
+++ b/bin/ovpn_revokeclient
@ -0,0 +1,62 @@
+#!/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(){
+    # Download EasyRSA because Ubuntu doesn't have it as a CLI command
+    /usr/share/easy-rsa/easyrsa revoke "$1"
+    echo "Generating the Certificate Revocation List :"
+    /usr/share/easy-rsa/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/bin/ovpn_run
+++ b/bin/ovpn_run
@ -10,8 +10,47 @@ fi

 set -e

+cd $OPENVPN
+
 # Build runtime arguments array based on environment
-ARGS=("--config" "$OPENVPN/openvpn.conf")
+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"

@ -21,7 +60,7 @@ if [ ! -c /dev/net/tun ]; then
 fi

 if [ -d "$OPENVPN/ccd" ]; then
-    ARGS+=("--client-config-dir" "$OPENVPN/ccd")
+    addArg "--client-config-dir" "$OPENVPN/ccd"
 fi

 # When using --net=host, use this to specify nat device.
@ -29,24 +68,21 @@ fi

 # 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
+	# 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 hacky hardlink as the CRL Needs to be readable by the user/group
+# 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 [ -r "$EASYRSA_PKI/crl.pem" ]; then
-    if [ ! -r "$OPENVPN/crl.pem" ]; then
-        ln "$EASYRSA_PKI/crl.pem" "$OPENVPN/crl.pem"
+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
-    ARGS+=("--crl-verify" "$OPENVPN/crl.pem")
+
+if [ -r "$OPENVPN/crl.pem" ]; then
+    addArg "--crl-verify" "$OPENVPN/crl.pem"
 fi

 ip -6 route show default 2>/dev/null
@ -55,12 +91,10 @@ if [ $? = 0 ]; then
    # 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

-if [ "$#" -gt 0 ]; then
-    exec openvpn "$@"
-else
-    exec openvpn ${ARGS[@]}
-fi
+echo "Running 'openvpn ${ARGS[@]} ${USER_ARGS[@]}'"
+exec openvpn ${ARGS[@]} ${USER_ARGS[@]}
--- a/containerfiles/Containerfile
+++ b/containerfiles/Containerfile
@ -0,0 +1,66 @@
+FROM ghcr.io/allanger/dumb-downloader as dudo
+ARG OPENVPN_VERSION
+RUN apt update && apt install gnupg tar -y
+RUN mkdir /output
+# ------------------------------------------------------
+# -- Downlaod OpenVPN
+# ------------------------------------------------------
+RUN dudo -l "https://keys.openpgp.org/vks/v1/by-fingerprint/F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7" -d security-openvpn-net.asc -p DUMMY
+RUN gpg --import security-openvpn-net.asc
+RUN dudo -l "https://swupdate.openvpn.org/community/releases/openvpn-{{ version }}.tar.gz.asc" -d /tmp/openvpn.asc -p ${OPENVPN_VERSION}
+# ------------------------------------------------------
+# -- todo: I should fix it later
+# ------------------------------------------------------
+# RUN gpg  --no-tty --verify /tmp/openvpn.asc
+RUN dudo -l "https://swupdate.openvpn.org/community/releases/openvpn-{{ version }}.tar.gz " -d /tmp/openvpn.tar.gz -p ${OPENVPN_VERSION}
+RUN tar -xf /tmp/openvpn.tar.gz  -C /tmp && rm -f /tmp/openvpn.tar.gz
+RUN mv /tmp/openvpn-${OPENVPN_VERSION} /output/openvpn
+
+FROM ubuntu:22.04 as builder
+# ------------------------------------------------------
+# -- TODO: Define it only once
+# ------------------------------------------------------
+ARG OPENVPN_VERSION
+COPY --from=dudo /output /src
+RUN apt-get update &&\
+      apt-get install -y wget tar unzip build-essential \
+      libssl-dev iproute2 liblz4-dev liblzo2-dev \
+      libpam0g-dev libpkcs11-helper1-dev libsystemd-dev \
+      easy-rsa iptables pkg-config libcap-ng-dev
+WORKDIR /src/openvpn
+RUN ./configure --disable-systemd --enable-async-push --enable-iproute2
+RUN make && make install
+RUN mkdir /output
+RUN cp $(which openvpn) /output/
+
+# ------------------------------------------------------
+# -- Final container
+# ------------------------------------------------------
+FROM ubuntu:22.04
+LABEL maintainer="allanger <allanger@zohomail.com>"
+COPY --from=builder /output /src
+# -------------------------------------------------------
+# -- Prepare system deps
+# -------------------------------------------------------
+RUN apt update && apt install openvpn easy-rsa iptables -y && \
+  mv /src/openvpn $(which openvpn)
+
+# Needed by scripts
+ENV OPENVPN /etc/openvpn
+
+# Prevents refused client connection because of an expired CRL
+ENV EASYRSA_CRL_DAYS 3650
+
+VOLUME ["/etc/openvpn"]
+
+# Internally uses port 1194, remap if needed using `docker run -p 443:1194/tcp`
+EXPOSE 1194
+
+CMD ["ovpn_run"]
+
+COPY --chmod='755' ./bin /usr/local/bin
+# -----------------------------------------------------------
+# -- Add support for OTP authentication using a PAM module
+# -- I have no idea how it works yet
+# -----------------------------------------------------------
+WORKDIR /etc/openvpn
--- a/containerfiles/Containerfile-XOR
+++ b/containerfiles/Containerfile-XOR
@ -0,0 +1,78 @@
+FROM ghcr.io/allanger/dumb-downloader as dudo
+ARG OPENVPN_VERSION
+ARG TUNNELBLICK_VERSION
+RUN apt update && apt install gnupg tar -y
+RUN mkdir /output
+# ------------------------------------------------------
+# -- Downlaod OpenVPN
+# ------------------------------------------------------
+RUN dudo -l "https://keys.openpgp.org/vks/v1/by-fingerprint/F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7" -d security-openvpn-net.asc -p DUMMY
+RUN gpg --import security-openvpn-net.asc
+RUN dudo -l "https://swupdate.openvpn.org/community/releases/openvpn-{{ version }}.tar.gz.asc" -d /tmp/openvpn.asc -p $OPENVPN_VERSION
+# ------------------------------------------------------
+# -- I should fix it later
+# ------------------------------------------------------
+# RUN gpg  --no-tty --verify /tmp/openvpn.asc
+RUN dudo -l "https://swupdate.openvpn.org/community/releases/openvpn-{{ version }}.tar.gz " -d /tmp/openvpn.tar.gz -p $OPENVPN_VERSION
+RUN tar -xf /tmp/openvpn.tar.gz  -C /tmp && rm -f /tmp/openvpn.tar.gz
+RUN mv /tmp/openvpn-$OPENVPN_VERSION /output/openvpn
+# ------------------------------------------------------
+# -- Download Tunnelblick
+# ------------------------------------------------------
+RUN dudo -l "https://github.com/Tunnelblick/Tunnelblick/archive/refs/tags/v{{ version }}.tar.gz" -d /tmp/tunnelblick.tar.gz -p $TUNNELBLICK_VERSION
+RUN tar -xf /tmp/tunnelblick.tar.gz  -C /tmp && rm -f /tmp/tunnelblick.tar.gz
+RUN mv /tmp/Tunnelblick-$TUNNELBLICK_VERSION /output/tunnelblick
+
+FROM ubuntu:24.04 as builder
+# ------------------------------------------------------
+# -- TODO: Define it only once
+# ------------------------------------------------------
+ARG OPENVPN_VERSION
+ARG TUNNELBLICK_VERSION
+COPY --from=dudo /output /src
+RUN apt-get update &&\
+      apt-get install -y wget tar unzip build-essential \
+      libssl-dev iproute2 liblz4-dev liblzo2-dev \
+      libpam0g-dev libpkcs11-helper1-dev libsystemd-dev \
+      easy-rsa iptables pkg-config libcap-ng-dev
+RUN cp /src/tunnelblick/third_party/sources/openvpn/openvpn-$OPENVPN_VERSION/patches/*.diff /src/openvpn
+WORKDIR /src/openvpn
+RUN for patch in $(find -type f | grep diff); do\
+        patch -p1 < $patch;\
+    done
+RUN ./configure --disable-systemd --enable-async-push --enable-iproute2
+RUN make && make install
+RUN mkdir /output
+RUN cp $(which openvpn) /output/
+
+# ------------------------------------------------------
+# -- Final container
+# ------------------------------------------------------
+FROM ubuntu:24.04
+LABEL maintainer="allanger <allanger@zohomail.com>"
+COPY --from=builder /output /src
+# -------------------------------------------------------
+# -- Prepare system deps
+# -------------------------------------------------------
+RUN apt update && apt install openvpn easy-rsa iptables -y && \
+  mv /src/openvpn $(which openvpn)
+
+# Needed by scripts
+ENV OPENVPN /etc/openvpn
+
+# Prevents refused client connection because of an expired CRL
+ENV EASYRSA_CRL_DAYS 3650
+
+VOLUME ["/etc/openvpn"]
+
+# Internally uses port 1194, remap if needed using `docker run -p 443:1194/tcp`
+EXPOSE 1194
+
+CMD ["ovpn_run"]
+
+COPY --chmod='755' ./bin /usr/local/bin
+# -----------------------------------------------------------
+# -- Add support for OTP authentication using a PAM module
+# -- I have no idea how it works yet
+# -----------------------------------------------------------
+WORKDIR /etc/openvpn
--- a/docs/advanced.md
+++ b/docs/advanced.md
@ -4,7 +4,7 @@ The [`ovpn_genconfig`](/bin/ovpn_genconfig) script is intended for simple config

 ## 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`
+* Refer to the Quick Start document, and substitute `-v $OVPN_DATA:/etc/openvpn` 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
--- a/docs/backup.md
+++ b/docs/backup.md
@ -11,10 +11,11 @@ I'd recommend encrypting the archive with something strong (e.g. gpg or openssl

 ## Backup to Archive

-    docker run --volumes-from $OVPN_DATA --rm busybox tar -cvf - -C /etc openvpn | xz > openvpn-backup.tar.xz
+    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn tar -cvf - -C /etc openvpn | xz > openvpn-backup.tar.xz

-## Restore to New Container
+## Restore to New Data Volume

-Assumes an existing container named `$OVPN_DATA` to extract the data over the top.
+Creates an volume container named `$OVPN_DATA` to extract the data to.

-    xzcat openvpn-backup.tar.xz | docker run --name $OVPN_DATA -v /etc/openvpn -i busybox tar -xvf - -C /etc
+    docker volume create --name $OVPN_DATA
+    xzcat openvpn-backup.tar.xz | docker run -v $OVPN_DATA:/etc/openvpn -i kylemanna/openvpn tar -xvf - -C /etc
--- a/docs/clients.md
+++ b/docs/clients.md
@ -9,13 +9,21 @@ The [`ovpn_getclient`](/bin/ovpn_getclient) can produce two different versions o

 Note that some client software might be picky about which configuration format it accepts.

+## Client List
+
+See an overview of the configured clients, including revocation and expiration status:
+
+    docker run --rm -it -v $OVPN_DATA:/etc/openvpn kylemanna/openvpn ovpn_listclients
+
+ The output is generated using `openssl verify`. Error codes from the verification process different from `X509_V_ERR_CERT_HAS_EXPIRED` or `X509_V_ERR_CERT_REVOKED` will show the status `INVALID`.
+
 ## 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
+    docker run --rm -it -v $OVPN_DATA:/etc/openvpn --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:

@ -28,9 +36,12 @@ After doing so, you will find the following files in each of the `$cn` directori

 ## Revoking Client Certificates

-Revoke `client1`'s certificate and generate the certificate revocation list (CRL):
+Revoke `client1`'s certificate and generate the certificate revocation list (CRL) using [`ovpn_revokeclient`](/bin/ovpn_revokeclient) script :

-    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
+    docker run --rm -it -v $OVPN_DATA:/etc/openvpn kylemanna/openvpn ovpn_revokeclient client1

 The OpenVPN server will read this change every time a client connects (no need to restart server) and deny clients access using revoked certificates.
+
+You can optionally pass `remove` as second parameter to ovpn_revokeclient to remove the corresponding crt, key and req files :
+
+    docker run --rm -it -v $OVPN_DATA:/etc/openvpn kylemanna/openvpn ovpn_revokeclient client1 remove
--- a/docs/debug.md
+++ b/docs/debug.md
@ -4,10 +4,10 @@ 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
+* Create a shell in the running docker container with `docker exec`.
+* To modify the data, you can also mount the data container and modify it with

-        docker run --rm -it --volumes-from $OVPN_DATA kylemanna/openvpn bash -l
+        docker run --rm -it -v $OVPN_DATA:/etc/openvpn kylemanna/openvpn bash -l

 ## Stream OpenVPN Logs

--- a/docs/docker-compose.md
+++ b/docs/docker-compose.md
@ -0,0 +1,77 @@
+# Quick Start with docker-compose
+
+* Add a new service in docker-compose.yml
+
+```yaml
+version: '2'
+services:
+  openvpn:
+    cap_add:
+     - NET_ADMIN
+    image: kylemanna/openvpn
+    container_name: openvpn
+    ports:
+     - "1194:1194/udp"
+    restart: always
+    volumes:
+     - ./openvpn-data/conf:/etc/openvpn
+```
+
+
+* Initialize the configuration files and certificates
+
+```bash
+docker-compose run --rm openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
+docker-compose run --rm openvpn ovpn_initpki
+```
+
+* Fix ownership (depending on how to handle your backups, this may not be needed)
+
+```bash
+sudo chown -R $(whoami): ./openvpn-data
+```
+
+* Start OpenVPN server process
+
+```bash
+docker-compose up -d openvpn
+```
+
+* You can access the container logs with
+
+```bash
+docker-compose logs -f
+```
+
+* Generate a client certificate
+
+```bash
+export CLIENTNAME="your_client_name"
+# with a passphrase (recommended)
+docker-compose run --rm openvpn easyrsa build-client-full $CLIENTNAME
+# without a passphrase (not recommended)
+docker-compose run --rm openvpn easyrsa build-client-full $CLIENTNAME nopass
+```
+
+* Retrieve the client configuration with embedded certificates
+
+```bash
+docker-compose run --rm openvpn ovpn_getclient $CLIENTNAME > $CLIENTNAME.ovpn
+```
+
+* Revoke a client certificate
+
+```bash
+# Keep the corresponding crt, key and req files.
+docker-compose run --rm openvpn ovpn_revokeclient $CLIENTNAME
+# Remove the corresponding crt, key and req files.
+docker-compose run --rm openvpn ovpn_revokeclient $CLIENTNAME remove
+```
+
+## Debugging Tips
+
+* Create an environment variable with the name DEBUG and value of 1 to enable debug output (using "docker -e").
+
+```bash
+docker-compose run -e DEBUG=1 -p 1194:1194/udp openvpn
+```
--- a/docs/faqs.md
+++ b/docs/faqs.md
@ -2,9 +2,9 @@

 ## How do I edit `openvpn.conf`?

-Use a Docker image with a text editor pre-installed (i.e. Ubuntu) and connect the volume container:
+Use a Docker image with an editor and connect the volume container:

-    docker run --volumes-from $OVPN_DATA --rm -it ubuntu vi /etc/openvpn/openvpn.conf
+    docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn vi /etc/openvpn/openvpn.conf


 ## Why not keep everything in one image?
@ -18,3 +18,9 @@ If it was all in one container, an upgrade would require a few steps to extract
 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 ...
+
+## I need to add some extra configurations to openvpn.conf, How can I do that ?
+
+You can pass multiple (**-e**) options to `ovpn_genconfig`. For example, if you need to add _'duplicate-cn'_ and _'topology subnet'_ to the server configuration you could do something like this:
+
+    ovpn_genconfig -e 'duplicate-cn' -e 'topology subnet' -u udp://VPN.SERVERNAME.COM
--- a/docs/ipv6.md
+++ b/docs/ipv6.md
@ -91,4 +91,11 @@ Fire up a web browser and attempt to navigate to [https://ipv6.google.com](https

 ## Connect to the OpenVPN Server Over IPv6

-Not implemented, yet.
+This feature requires a docker daemon with working IPv6 support.
+
+This will allow connections over IPv4 and IPv6.
+
+Generate server configuration with the udp6 or tcp6 protocol:
+
+    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u udp6://VPN.SERVERNAME.COM
+    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u tcp6://VPN.SERVERNAME.COM
--- a/docs/otp.md
+++ b/docs/otp.md
@ -11,17 +11,19 @@ and use this image to generate user configuration.

 In order to enable two factor authentication the following steps are required.

-* Generate server configuration with `-2` option
+* Choose a more secure [cipher](https://community.openvpn.net/openvpn/wiki/SWEET32) to use because since [OpenVPN 2.3.13](https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.13) the default openvpn cipher BF-CBC will cause a renegotiated connection every 64 MB of data

-        docker run --volumes-from $OVPN_DATA --rm fabn/openvpn ovpn_genconfig -u udp://vpn.example.com -2
+* Generate server configuration with `-2` and `-C $CIPHER` options
+
+        docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u udp://vpn.example.com -2 -C $CIPHER

 * 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
+        docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/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>
+        docker run -v $OVPN_DATA:/etc/openvpn --rm -t kylemanna/openvpn ovpn_otp_user <user>

 The last step will generate OTP configuration for the provided user with the following options

@ -62,11 +64,13 @@ 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
+docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn bash
+# Then in container you have pamtester utility already installed
+which pamtester
 # To check authentication use this command that will prompt for a valid code from Authenticator APP
 pamtester -v openvpn <user> authenticate
 ```

+In the last command `<user>` should be replaced by the exact string you used in the ovpn_otp_user command.
+
 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,6 +1,6 @@
 # Advanced security

-## Keep the CA root key save
+## Keep the CA root key safe
 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.
@ -13,7 +13,7 @@ The [`ovpn_copy_server_files`](/bin/ovpn_copy_server_files) script puts all the

 ## Crypto Hardening

-If you want to select the cyphers used by OpenVPN the following parameters of the `ovpn_genconfig` might interest you:
+If you want to select the ciphers 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).
@ -22,11 +22,28 @@ If you want to select the cyphers used by OpenVPN the following parameters of th

 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'
+    docker run -v $OVPN_DATA:/etc/openvpn --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

+## EasyRSA and 4096 bit RSA Keys
+
+EasyRSA will generate 4096 bit RSA keys when the `-e EASYRSA_KEY_SIZE=4096` argument is added to `ovpn_initpki` and `easyrsa build-client-full` commands.
+
+    docker run -e EASYRSA_KEY_SIZE=4096 -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn ovpn_initpki
+    docker run -e EASYRSA_KEY_SIZE=4096 -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn easyrsa build-client-full CLIENTNAME nopass
+
+## Logging and stdout
+
+Because you are running within Docker, remember that any command that generates output to stdout may also log that output through Docker's log-driver mechanism. That may mean that e.g. keying material generated by `ovpn_getclient` will be logged somewhere that you don't want it to be logged.
+
+A simple way to avoid having Docker log output for a given command is to run with `--log-driver=none`, e.g
+
+    docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm kylemanna/openvpn ovpn_getclient USER > USER.ovpn
+
+## Additional Resources
+
 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/static-ips.md
+++ b/docs/static-ips.md
@ -6,7 +6,7 @@ The docker image is setup for static client configuration on the 192.168.254.0/2

 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
+        $ echo "ifconfig-push 192.168.254.1 192.168.254.2" | docker run -v $OVPN_DATA:/etc/openvpn -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
@ -15,10 +15,10 @@ The docker image is setup for static client configuration on the 192.168.254.0/2

 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
+    docker run -v $OVPN_DATA:/etc/openvpn -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
+    docker run  -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig
--- a/docs/systemd.md
+++ b/docs/systemd.md
@ -0,0 +1,43 @@
+# Docker + OpenVPN systemd Service
+
+The systemd service aims to make the update and invocation of the
+`docker-openvpn` container seamless.  It automatically downloads the latest
+`docker-openvpn` image and instantiates a Docker container with that image.  At
+shutdown it cleans-up the old container.
+
+In the event the service dies (crashes, or is killed) systemd will attempt to
+restart the service every 10 seconds until the service is stopped with
+`systemctl stop docker-openvpn@NAME.service`.
+
+A number of IPv6 hacks are incorporated to workaround Docker shortcomings and
+are harmless for those not using IPv6.
+
+To use and enable automatic start by systemd:
+
+1. Create a Docker volume container named `ovpn-data-NAME` where `NAME` is the
+   user's choice to describe the use of the container.  In this example
+   configuration, `NAME=example`.
+   
+        OVPN_DATA="ovpn-data-example"
+        docker volume create --name $OVPN_DATA
+   
+2. Initialize the data container, but don't start the container :
+   
+       docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
+       docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn ovpn_initpki
+   
+3. Download the [docker-openvpn@.service](https://raw.githubusercontent.com/kylemanna/docker-openvpn/master/init/docker-openvpn%40.service)
+   file to `/etc/systemd/system`:
+
+        curl -L https://raw.githubusercontent.com/kylemanna/docker-openvpn/master/init/docker-openvpn%40.service | sudo tee /etc/systemd/system/docker-openvpn@.service
+
+4. Enable and start the service with:
+
+        systemctl enable --now docker-openvpn@example.service
+
+5. Verify service start-up with:
+
+        systemctl status docker-openvpn@example.service
+        journalctl --unit docker-openvpn@example.service
+
+For more information, see the [systemd manual pages](https://www.freedesktop.org/software/systemd/man/index.html).
--- a/docs/tcp.md
+++ b/docs/tcp.md
@ -5,14 +5,41 @@ By default, OpenVPN is configured to use the UDP protocol.  Because UDP incurs m

 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.

+Another example would be trying to open a VPN connection from within a very restrictive network. In some cases port 1194, or even UDP traffic on any port, may be restricted by network policy. Because TCP traffic on port 443 is used for normal TLS (https) web browsing, it is very unlikely to be blocked.
+
 ## 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
+    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u tcp://VPN.SERVERNAME.COM:443
+    docker run -v $OVPN_DATA:/etc/openvpn --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
+    docker run -v $OVPN_DATA:/etc/openvpn -d -p 443:1194/tcp --cap-add=NET_ADMIN kylemanna/openvpn

+## Running a Second Fallback TCP Container
+Instead of choosing between UDP and TCP, you can use both. A single instance of OpenVPN can only listen for a single protocol on a single port, but this image makes it easy to run two instances simultaneously. After building, configuring, and starting a standard container listening for UDP traffic on 1194, you can start a second container listening for tcp traffic on port 443:
+
+    docker run -v $OVPN_DATA:/etc/openvpn --rm -p 443:1194/tcp --privileged kylemanna/openvpn ovpn_run --proto tcp
+
+`ovpn_run` will load all the values from the default config file, and `--proto tcp` will override the protocol setting.
+
+This allows you to use UDP most of the time, but fall back to TCP on the rare occasion that you need it.
+
+Note that you will need to configure client connections manually. At this time it is not possible to generate a client config that will automatically fall back to the TCP connection.
+
+## Forward HTTP/HTTPS connection to another TCP port
+You might run into cases where you want your OpenVPN server listening on TCP port 443 to allow connection behind a restricted network, but you already have a webserver on your host running on that port. OpenVPN has a built-in option named `port-share` that allow you to proxy incoming traffic that isn't OpenVPN protocol to another host and port.
+
+First, change the listening port of your existing webserver (for instance from 443 to 4433).
+
+Then initialize the data container by specifying the TCP protocol, port 443 and the port-share option:
+
+    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig \
+    -u tcp://VPN.SERVERNAME.COM:443 \
+    -e 'port-share VPN.SERVERNAME.COM 4433'
+    
+Then proceed to initialize the pki, create your users and start the container as usual.
+    
+This will proxy all non OpenVPN traffic incoming on TCP port 443 to TCP port 4433 on the same host. This is currently only designed to work with HTTP or HTTPS protocol.
--- a/env/openvpn.env
+++ b/env/openvpn.env
@ -0,0 +1,3 @@
+export OPENVPN_VERSION=2.6.5
+export CONTAINERFILE=./containerfiles/Containerfile
+export SCRIPT=build_upstream.sh
--- a/env/openvpn_xor.env
+++ b/env/openvpn_xor.env
@ -0,0 +1,3 @@
+export TUNNELBLICK_VERSION=6.0beta03
+export CONTAINERFILE=./containerfiles/Containerfile-XOR
+export SCRIPT=build_xor.sh
--- a/init/docker-openvpn@.service
+++ b/init/docker-openvpn@.service
@ -1,8 +1,40 @@
+#
+# Docker + OpenVPN systemd service
+#
+# Author: Kyle Manna <kyle@kylemanna.com>
+# Source: https://github.com/kylemanna/docker-openvpn
+#
+# This service aims to make the update and invocation of the docker-openvpn
+# container seemless.  It automatically downloads the latest docker-openvpn
+# image and instantiates a Docker container with that image.  At shutdown it
+# cleans-up the old container.
+#
+# In the event the service dies (crashes, or is killed) systemd will attempt
+# to restart the service every 10 seconds until the service is stopped with
+# `systemctl stop docker-openvpn@NAME`.
+#
+# A number of IPv6 hacks are incorporated to workaround Docker shortcomings and
+# are harmless for those not using IPv6.
+#
+# To use:
+# 1. Create a Docker volume container named `ovpn-data-NAME` where NAME is the
+#    user's choice to describe the use of the container.
+# 2. Initialize the data container according to the docker-openvpn README, but
+#    don't start the container. Stop the docker container if started.
+# 3. Download this service file to /etc/systemd/service/docker-openvpn@.service
+# 4. Enable and start the service template with:
+#    `systemctl enable --now docker-openvpn@NAME.service`
+# 5. Verify service start-up with:
+#    `systemctl status docker-openvpn@NAME.service`
+#    `journalctl --unit docker-openvpn@NAME.service`
+#
+# For more information, see the systemd manual pages.
+#
 [Unit]
 Description=OpenVPN Docker Container
 Documentation=https://github.com/kylemanna/docker-openvpn
-After=network.target docker.socket
-Requires=docker.socket
+After=network.target docker.service
+Requires=docker.service

 [Service]
 RestartSec=10
@ -32,7 +64,7 @@ ExecStartPre=-/usr/bin/docker pull $IMG
 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
+ExecStart=/usr/bin/docker run --rm --cap-add=NET_ADMIN -v ${DATA_VOL}:/etc/openvpn --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'
--- a/init/upstart.init
+++ b/init/upstart.init
@ -4,5 +4,5 @@ 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
+  exec docker run -v ovpn-data-example:/etc/openvpn --rm -p 1194:1194/udp --cap-add=NET_ADMIN kylemanna/openvpn
 end script
--- a/otp/openvpn
+++ b/otp/openvpn
@ -1,7 +0,0 @@
-# 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
-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)
-account sufficient pam_permit.so
--- a/renovate.json
+++ b/renovate.json
@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}
--- a/scripts/build_upstream.sh
+++ b/scripts/build_upstream.sh
@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+export CUSTOM_TAG="v$OPENVPN_VERSION"
+export BUILD_ARGS="--build-arg OPENVPN_VERSION=$OPENVPN_VERSION"
+build-container
--- a/scripts/build_xor.sh
+++ b/scripts/build_xor.sh
@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+git clone https://github.com/Tunnelblick/Tunnelblick.git /tmp/tunnelblick
+git -C /tmp/tunnelblick checkout $TUNNELBLICK_VERSION
+export OPENVPN_VERSION=$(ls /tmp/tunnelblick/third_party/sources/openvpn | sed 's/openvpn-//g' | sort  -k1,1nr -k2,2n -k3,3n | head -n 1)
+export CUSTOM_TAG="v$OPENVPN_VERSION-XOR-$TUNNELBLICK_VERSION"
+export BUILD_ARGS="--build-arg OPENVPN_VERSION=$OPENVPN_VERSION --build-arg TUNNELBLICK_VERSION=$TUNNELBLICK_VERSION"
+build-container
--- a/test/README.md
+++ b/test/README.md
@ -0,0 +1,19 @@
+# Tests
+
+Philosophy is to not re-invent the wheel while allowing users to quickly test repository specific tests.
+
+Example invocation from top-level of repository:
+
+    docker build -t kylemanna/openvpn .
+    test/run.sh kylemanna/openvpn
+    # Be sure to pull kylemanna/openvpn:latest after you're done testing
+
+More details: https://github.com/docker-library/official-images/tree/master/test
+
+## Continuous Integration
+
+The set of scripts defined by `config.sh` are run every time a pull request or push to the repository is made.
+
+## Maintenance
+
+Periodically these scripts may need to be synchronized with their upsteam source.  Would be nice to be able to just use them from upstream if it such a feature is added later to avoid having to copy them in place.
--- a/tests/client/wait-for-connect.sh
+++ b/tests/client/wait-for-connect.sh
@ -1,5 +1,8 @@
 #!/bin/bash
-set -ex
+set -e
+
+[ -n "${DEBUG+x}" ] && set -x
+
 OPENVPN_CONFIG=${1:-/client/config.ovpn}

 # Run in background, rely on bash for job management
--- a/test/config.sh
+++ b/test/config.sh
@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+testAlias+=(
+	[kylemanna/openvpn]='openvpn'
+)
+
+imageTests+=(
+	[openvpn]='
+	paranoid
+        conf_options
+        client
+        basic
+        dual-proto
+        otp
+	iptables
+	revocation
+	'
+)
--- a/test/run.sh
+++ b/test/run.sh
@ -0,0 +1,202 @@
+#!/bin/bash
+set -e
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+self="$(basename "$0")"
+
+usage() {
+	cat <<EOUSAGE
+
+usage: $self [-t test ...] image:tag [...]
+   ie: $self debian:wheezy
+       $self -t utc python:3
+       $self -t utc python:3 -t python-hy
+
+This script processes the specified Docker images to test their running
+environments.
+EOUSAGE
+}
+
+# arg handling
+opts="$(getopt -o 'ht:c:?' --long 'dry-run,help,test:,config:' -- "$@" || { usage >&2 && false; })"
+eval set -- "$opts"
+
+declare -A argTests=()
+declare -a configs=()
+dryRun=
+while true; do
+	flag=$1
+	shift
+	case "$flag" in
+		--dry-run) dryRun=1 ;;
+		--help|-h|'-?') usage && exit 0 ;;
+		--test|-t) argTests["$1"]=1 && shift ;;
+		--config|-c) configs+=("$(readlink -f "$1")") && shift ;;
+		--) break ;;
+		*)
+			{
+				echo "error: unknown flag: $flag"
+				usage
+			} >&2
+			exit 1
+			;;
+	esac
+done
+
+if [ $# -eq 0 ]; then
+	usage >&2
+	exit 1
+fi
+
+# declare configuration variables
+declare -a globalTests=()
+declare -A testAlias=()
+declare -A imageTests=()
+declare -A globalExcludeTests=()
+declare -A explicitTests=()
+
+# if there are no user-specified configs, use the default config
+if [ ${#configs} -eq 0 ]; then
+	configs+=("$dir/config.sh")
+fi
+
+# load the configs
+declare -A testPaths=()
+for conf in "${configs[@]}"; do
+	. "$conf"
+
+	# Determine the full path to any newly-declared tests
+	confDir="$(dirname "$conf")"
+
+	for testName in ${globalTests[@]} ${imageTests[@]}; do
+		[ "${testPaths[$testName]}" ] && continue
+
+		if [ -d "$confDir/tests/$testName" ]; then
+			# Test directory found relative to the conf file
+			testPaths[$testName]="$confDir/tests/$testName"
+		elif [ -d "$dir/tests/$testName" ]; then
+			# Test directory found in the main tests/ directory
+			testPaths[$testName]="$dir/tests/$testName"
+		fi
+	done
+done
+
+didFail=
+for dockerImage in "$@"; do
+	echo "testing $dockerImage"
+	
+	if ! docker inspect "$dockerImage" &> /dev/null; then
+		echo $'\timage does not exist!'
+		didFail=1
+		continue
+	fi
+	
+	repo="${dockerImage%:*}"
+	tagVar="${dockerImage#*:}"
+	#version="${tagVar%-*}"
+	variant="${tagVar##*-}"
+	
+	testRepo=$repo
+	[ -z "${testAlias[$repo]}" ] || testRepo="${testAlias[$repo]}"
+	
+	explicitVariant=
+	if [ \
+		"${explicitTests[:$variant]}" \
+		-o "${explicitTests[$repo:$variant]}" \
+		-o "${explicitTests[$testRepo:$variant]}" \
+	]; then
+		explicitVariant=1
+	fi
+	
+	testCandidates=()
+	if [ -z "$explicitVariant" ]; then
+		testCandidates+=( "${globalTests[@]}" )
+	fi
+	testCandidates+=(
+		${imageTests[:$variant]}
+	)
+	if [ -z "$explicitVariant" ]; then
+		testCandidates+=(
+			${imageTests[$testRepo]}
+		)
+	fi
+	testCandidates+=(
+		${imageTests[$testRepo:$variant]}
+	)
+	if [ "$testRepo" != "$repo" ]; then
+		if [ -z "$explicitVariant" ]; then
+			testCandidates+=(
+				${imageTests[$repo]}
+			)
+		fi
+		testCandidates+=(
+			${imageTests[$repo:$variant]}
+		)
+	fi
+	
+	tests=()
+	for t in "${testCandidates[@]}"; do
+		if [ ${#argTests[@]} -gt 0 -a -z "${argTests[$t]}" ]; then
+			# skipping due to -t
+			continue
+		fi
+		
+		if [ \
+			! -z "${globalExcludeTests[${testRepo}_$t]}" \
+			-o ! -z "${globalExcludeTests[${testRepo}:${variant}_$t]}" \
+			-o ! -z "${globalExcludeTests[:${variant}_$t]}" \
+			-o ! -z "${globalExcludeTests[${repo}_$t]}" \
+			-o ! -z "${globalExcludeTests[${repo}:${variant}_$t]}" \
+			-o ! -z "${globalExcludeTests[:${variant}_$t]}" \
+		]; then
+			# skipping due to exclude
+			continue
+		fi
+		
+		tests+=( "$t" )
+	done
+	
+	currentTest=0
+	totalTest="${#tests[@]}"
+	for t in "${tests[@]}"; do
+		(( currentTest+=1 ))
+		echo -ne "\t'$t' [$currentTest/$totalTest]..."
+		
+		# run test against dockerImage here
+		# find the script for the test
+		scriptDir="${testPaths[$t]}"
+		if [ -d "$scriptDir" ]; then
+			script="$scriptDir/run.sh"
+			if [ -x "$script" -a ! -d "$script" ]; then
+				# TODO dryRun logic
+				if output="$("$script" $dockerImage)"; then
+					if [ -f "$scriptDir/expected-std-out.txt" ] && ! d="$(echo "$output" | diff -u "$scriptDir/expected-std-out.txt" - 2>/dev/null)"; then
+						echo 'failed; unexpected output:'
+						echo "$d"
+						didFail=1
+					else
+						echo 'passed'
+					fi
+				else
+					echo 'failed'
+					didFail=1
+				fi
+			else
+				echo "skipping"
+				echo >&2 "error: $script missing, not executable or is a directory"
+				didFail=1
+				continue
+			fi
+		else
+			echo "skipping"
+			echo >&2 "error: unable to locate test '$t'"
+			didFail=1
+			continue
+		fi
+	done
+done
+
+if [ "$didFail" ]; then
+	exit 1
+fi
--- a/test/tests/basic/run.sh
+++ b/test/tests/basic/run.sh
@ -1,45 +1,46 @@
 #!/bin/bash
-set -ex
+set -e
+
+[ -n "${DEBUG+x}" ] && set -x
+
 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
+CLIENT_DIR="$(readlink -f "$(dirname "$BASH_SOURCE")/../../client")"

 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
+docker run -v $OVPN_DATA:/etc/openvpn --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 -v $OVPN_DATA:/etc/openvpn --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 -v $OVPN_DATA:/etc/openvpn --rm -it $IMG easyrsa build-client-full $CLIENT nopass

-docker run --volumes-from $OVPN_DATA --rm $IMG ovpn_getclient $CLIENT | tee client/config.ovpn
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_getclient $CLIENT | tee $CLIENT_DIR/config.ovpn
+
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_listclients | grep $CLIENT

 #
 # Fire up the server
 #
-sudo iptables -N DOCKER
-sudo iptables -I FORWARD -j DOCKER
+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 &
+docker run --name "ovpn-test" -v $OVPN_DATA:/etc/openvpn --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
+#sed -ie s:SERV_IP:$SERV_IP:g 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
+docker run --rm --net=host --privileged --volume $CLIENT_DIR:/client $IMG /client/wait-for-connect.sh

 #
 # Client either connected or timed out, kill server
--- a/test/tests/client/container.sh
+++ b/test/tests/client/container.sh
@ -0,0 +1,84 @@
+#!/bin/bash
+
+SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
+SERVER_CONF="/etc/openvpn/openvpn.conf"
+TEST1_OVPN="/etc/openvpn/test1.ovpn"
+
+# Function to fail
+abort() { cat <<< "$@" 1>&2; exit 1; }
+
+# Check a config (haystack) for a given line (needle) exit with error if not
+# found.
+test_config() {
+
+    local needle="${2}"
+    local file="${1}"
+
+    busybox grep -q "${needle}" "${file}"
+    if [ $? -ne 0 ]; then
+        abort "==> Config match not found: ${needle}"
+    fi
+}
+
+# Check a config (haystack) for absence of given line (needle) exit with error
+# if found.
+test_not_config() {
+
+    local needle="${2}"
+    local file="${1}"
+
+    busybox grep -vq "${needle}" "${file}"
+    if [ $? -ne 0 ]; then
+        abort "==> Config match found: ${needle}"
+    fi
+}
+
+
+#
+# Generate openvpn.config file
+#
+
+ovpn_genconfig \
+    -u udp://$SERV_IP \
+    -m 1337 \
+
+
+EASYRSA_BATCH=1 EASYRSA_REQ_CN="Travis-CI Test CA" ovpn_initpki nopass
+
+easyrsa build-client-full test1 nopass 2>/dev/null
+
+ovpn_getclient test1 > "${TEST1_OVPN}"
+
+
+#
+# Simple test cases
+#
+
+# 1. client MTU
+test_config "${TEST1_OVPN}" "^tun-mtu\s\+1337"
+
+
+#
+# Test udp client with tcp fallback
+#
+ovpn_genconfig -u udp://$SERV_IP -E "remote $SERV_IP 443 tcp" -E "remote vpn.example.com 443 tcp"
+# nopass is insecure
+EASYRSA_BATCH=1 EASYRSA_REQ_CN="Travis-CI Test CA" ovpn_initpki nopass
+easyrsa build-client-full client-fallback nopass
+ovpn_getclient client-fallback > "${TEST1_OVPN}"
+
+test_config "${TEST1_OVPN}" "^remote\s\+$SERV_IP\s\+443\s\+tcp"
+test_config "${TEST1_OVPN}" "^remote\s\+vpn.example.com\s\+443\s\+tcp"
+
+
+#
+# Test non-defroute config
+#
+ovpn_genconfig -d -u udp://$SERV_IP -r "172.33.33.0/24" -r "172.34.34.0/24"
+# nopass is insecure
+EASYRSA_BATCH=1 EASYRSA_REQ_CN="Travis-CI Test CA" ovpn_initpki nopass
+easyrsa build-client-full non-defroute nopass
+ovpn_getclient non-defroute > "${TEST1_OVPN}"
+
+# The '!' inverts the match to test that the string isn't present
+test_not_config "${TEST1_OVPN}" "^redirect-gateway\s\+def1"
--- a/test/tests/client/run.sh
+++ b/test/tests/client/run.sh
@ -0,0 +1 @@
+../run-bash-in-container.sh
--- a/test/tests/conf_options/container.sh
+++ b/test/tests/conf_options/container.sh
@ -0,0 +1,116 @@
+#!/bin/bash
+
+SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
+SERVER_CONF="/etc/openvpn/openvpn.conf"
+TEST1_OVPN="/etc/openvpn/test1.ovpn"
+
+# Function to fail
+abort() { cat <<< "$@" 1>&2; exit 1; }
+
+# Check a config (haystack) for a given line (needle) exit with error if not found.
+test_config() {
+
+    local needle="${2}"
+    local file="${1}"
+
+    busybox grep -q "${needle}" "${file}"
+    if [ $? -ne 0 ]; then
+        abort "==> Config match not found: ${needle}"
+    fi
+}
+
+# Check a config (haystack) for absence of given line (needle) exit with error
+# if found.
+test_not_config() {
+
+    local needle="${2}"
+    local file="${1}"
+
+    busybox grep -vq "${needle}" "${file}"
+    if [ $? -ne 0 ]; then
+        abort "==> Config match found: ${needle}"
+    fi
+}
+
+
+#
+# Generate openvpn.config file
+#
+read -d '' MULTILINE_EXTRA_SERVER_CONF << EOF
+management localhost 7505
+max-clients 10
+EOF
+
+ovpn_genconfig \
+    -u udp://$SERV_IP \
+    -f 1400 \
+    -k '60 300' \
+    -e "$MULTILINE_EXTRA_SERVER_CONF" \
+    -e 'duplicate-cn' \
+    -e 'topology subnet' \
+    -p 'route 172.22.22.0 255.255.255.0' \
+
+# Run ovpn_genconfig a second time with no arguments to test its repeatability.
+ovpn_genconfig
+
+#
+# Simple test cases
+#
+
+# 1. verb config
+test_config "${SERVER_CONF}" "^verb\s\+3"
+
+# 2. fragment config
+test_config "${SERVER_CONF}" "^fragment\s\+1400"
+
+## Tests for extra configs
+# 3. management config
+test_config "${SERVER_CONF}" "^management\s\+localhost\s\+7505"
+
+# 4. max-clients config
+test_config "${SERVER_CONF}" "^max-clients\s\+10"
+
+# 5. duplicate-cn config
+test_config "${SERVER_CONF}" "^duplicate-cn"
+
+# 6. topology config
+test_config "${SERVER_CONF}" "^topology\s\+subnet"
+
+## Tests for push config
+# 7. push route
+test_config "${SERVER_CONF}" '^push\s\+"route\s\+172.22.22.0\s\+255.255.255.0"'
+
+## Test for default
+# 8. Should see default route if none provided
+test_config "${SERVER_CONF}" "^route\s\+192.168.254.0\s\+255.255.255.0"
+
+# 9. Should see a push of 'block-outside-dns' by default
+test_config "${SERVER_CONF}" '^push\s\+"block-outside-dns"'
+
+# 10. Should see a push of 'dhcp-option DNS' by default
+test_config "${SERVER_CONF}" '^push\s\+"dhcp-option\s\+DNS\s\+8.8.8.8"'
+test_config "${SERVER_CONF}" '^push\s\+"dhcp-option\s\+DNS\s\+8.8.4.4"'
+
+## Test for keepalive
+# 11. keepalive config
+test_config "${SERVER_CONF}" '^keepalive\s\+60\s\+300'
+
+
+#
+# More elaborate route tests
+#
+
+ovpn_genconfig -u udp://$SERV_IP -r "172.33.33.0/24" -r "172.34.34.0/24"
+
+test_config "${SERVER_CONF}" "^route\s\+172.33.33.0\s\+255.255.255.0"
+test_config "${SERVER_CONF}" "^route\s\+172.34.34.0\s\+255.255.255.0"
+
+
+#
+# Block outside DNS test
+#
+
+ovpn_genconfig -u udp://$SERV_IP -b
+
+test_not_config "${SERVER_CONF}" '^push "block-outside-dns"'
+cat ${SERVER_CONF} >&1
--- a/test/tests/conf_options/run.sh
+++ b/test/tests/conf_options/run.sh
@ -0,0 +1 @@
+../run-bash-in-container.sh
--- a/test/tests/docker-build.sh
+++ b/test/tests/docker-build.sh
@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+
+# wrapper around "docker build" that creates a temporary directory and copies files into it first so that arbitrary host directories can be copied into containers without bind mounts, but accepts a Dockerfile on stdin
+
+# usage: ./docker-build.sh some-host-directory some-new-image:some-tag <<EOD
+#        FROM ...
+#        COPY dir/... /.../
+#        EOD
+#    ie: ./docker-build.sh .../hylang-hello-world librarytest/hylang <<EOD
+#        FROM hylang
+#        COPY dir/container.hy /dir/
+#        CMD ["hy", "/dir/container.hy"]
+#        EOD
+
+dir="$1"; shift
+[ -d "$dir" ]
+
+imageTag="$1"; shift
+
+tmp="$(mktemp -t -d docker-library-test-build-XXXXXXXXXX)"
+trap "rm -rf '$tmp'" EXIT
+
+cat > "$tmp/Dockerfile"
+
+from="$(awk -F '[ \t]+' 'toupper($1) == "FROM" { print $2; exit }' "$tmp/Dockerfile")"
+onbuilds="$(docker inspect -f '{{len .Config.OnBuild}}' "$from")"
+if [ "$onbuilds" -gt 0 ]; then
+	# crap, the image we want to build has some ONBUILD instructions
+	# those are kind of going to ruin our day
+	# let's do some hacks to strip those bad boys out in a new fake layer
+	"$(dirname "$(readlink -f "$BASH_SOURCE")")/remove-onbuild.sh" "$from" "$imageTag"
+	awk -F '[ \t]+' 'toupper($1) == "FROM" { $2 = "'"$imageTag"'" } { print }' "$tmp/Dockerfile" > "$tmp/Dockerfile.new"
+	mv "$tmp/Dockerfile.new" "$tmp/Dockerfile"
+fi
+
+cp -RL "$dir" "$tmp/dir"
+
+docker build -t "$imageTag" "$tmp" > /dev/null
--- a/test/tests/dual-proto/run.sh
+++ b/test/tests/dual-proto/run.sh
@ -0,0 +1,70 @@
+#!/bin/bash
+set -e
+
+[ -n "${DEBUG+x}" ] && set -x
+
+OVPN_DATA=dual-data
+CLIENT_UDP=travis-client
+CLIENT_TCP=travis-client-tcp
+IMG=kylemanna/openvpn
+CLIENT_DIR="$(readlink -f "$(dirname "$BASH_SOURCE")/../../client")"
+
+ip addr ls
+SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
+
+# get temporary TCP config
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_genconfig -u tcp://$SERV_IP:443
+
+# nopass is insecure
+docker run -v $OVPN_DATA:/etc/openvpn --rm -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
+
+# gen TCP client
+docker run -v $OVPN_DATA:/etc/openvpn --rm -it $IMG easyrsa build-client-full $CLIENT_TCP nopass
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_getclient $CLIENT_TCP | tee $CLIENT_DIR/config-tcp.ovpn
+
+# switch to UDP config and gen UDP client
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_genconfig -u udp://$SERV_IP
+docker run -v $OVPN_DATA:/etc/openvpn --rm -it $IMG easyrsa build-client-full $CLIENT_UDP nopass
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_getclient $CLIENT_UDP | tee $CLIENT_DIR/config.ovpn
+
+#Verify client configs
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_listclients | grep $CLIENT_TCP
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_listclients | grep $CLIENT_UDP
+
+#
+# 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-udp" -v $OVPN_DATA:/etc/openvpn --rm -p 1194:1194/udp --privileged $IMG &
+docker run --name "ovpn-test-tcp" -v $OVPN_DATA:/etc/openvpn --rm -p 443:1194/tcp --privileged $IMG ovpn_run --proto tcp &
+
+#
+# Fire up a clients in a containers 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 $CLIENT_DIR:/client $IMG /client/wait-for-connect.sh
+docker run --rm --net=host --privileged --volume $CLIENT_DIR:/client $IMG /client/wait-for-connect.sh "/client/config-tcp.ovpn"
+
+#
+# Client either connected or timed out, kill server
+#
+kill %1 %2
+
+#
+# Celebrate
+#
+cat <<EOF
+ ____________               ___________
+< it worked! >             < both ways! >
+ ------------               ------------
+        \   ^__^        ^__^   /
+	 \  (oo)\______/(oo)  /
+	    (__)\      /(__)
+                ||w---w||
+                ||     ||
+EOF
+
--- a/test/tests/image-name.sh
+++ b/test/tests/image-name.sh
@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+# usage: ./image-name.sh librarytest/something some/image:some-tag
+# output: librarytest/something:some-image-some-tag
+
+base="$1"; shift
+tag="$1"; shift
+
+echo "$base:$(echo "$tag" | sed 's![:/]!-!g')"
--- a/test/tests/iptables/run.sh
+++ b/test/tests/iptables/run.sh
@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+
+[ -n "${DEBUG+x}" ] && set -x
+OVPN_DATA=basic-data
+IMG="kylemanna/openvpn"
+NAME="ovpn-test"
+SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
+
+# generate server config including iptables nat-ing
+docker volume create --name $OVPN_DATA
+docker run --rm -v $OVPN_DATA:/etc/openvpn $IMG ovpn_genconfig -u udp://$SERV_IP -N
+docker run -v $OVPN_DATA:/etc/openvpn --rm -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
+
+# Fire up the server
+docker run -d --name $NAME -v $OVPN_DATA:/etc/openvpn --cap-add=NET_ADMIN $IMG
+
+# check default iptables rules
+docker exec -ti $NAME bash -c 'source /etc/openvpn/ovpn_env.sh; eval iptables -t nat -C POSTROUTING -s $OVPN_SERVER -o eth0 -j MASQUERADE'
+
+# append new setupIptablesAndRouting function to config
+docker exec -ti $NAME bash -c 'echo function setupIptablesAndRouting { iptables -t nat -A POSTROUTING -m comment --comment "test"\;} >> /etc/openvpn/ovpn_env.sh'
+
+# kill server in preparation to modify config
+docker kill $NAME
+docker rm $NAME
+
+# check that overridden function exists and that test iptables rules is active
+docker run -d --name $NAME -v $OVPN_DATA:/etc/openvpn --cap-add=NET_ADMIN $IMG
+docker exec -ti $NAME bash -c 'source /etc/openvpn/ovpn_env.sh; type -t setupIptablesAndRouting && iptables -t nat -C POSTROUTING -m comment --comment "test"'
+
+#
+# kill server
+#
+
+docker kill $NAME
+docker rm $NAME
+docker volume rm $OVPN_DATA
--- a/test/tests/otp/run.sh
+++ b/test/tests/otp/run.sh
@ -1,44 +1,50 @@
 #!/bin/bash
-set -ex
+set -e
+
+[ -n "${DEBUG+x}" ] && set -x
+
 OVPN_DATA=basic-data-otp
 CLIENT=travis-client
 IMG=kylemanna/openvpn
 OTP_USER=otp
+CLIENT_DIR="$(readlink -f "$(dirname "$BASH_SOURCE")/../../client")"
+
 # 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
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_genconfig -u udp://$SERV_IP -2
+
+# Ensure reneg-sec 0 in server config when two factor is enabled
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG cat /etc/openvpn/openvpn.conf | grep 'reneg-sec 0' || abort 'reneg-sec not set to 0 in server config'

 # 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 -v $OVPN_DATA:/etc/openvpn --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 -v $OVPN_DATA:/etc/openvpn --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
+docker run -v $OVPN_DATA:/etc/openvpn --rm -it $IMG ovpn_otp_user $OTP_USER | tee $CLIENT_DIR/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'
+grep 'https://www.google.com/chart' $CLIENT_DIR/qrcode.txt || abort 'Link to chart not generated'
+grep 'Your new secret key is:' $CLIENT_DIR/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:]]')
+OTP_TOKEN=$(grep -A1 'Your emergency scratch codes are' $CLIENT_DIR/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
+echo -e "$OTP_USER\n$OTP_TOKEN" > $CLIENT_DIR/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
+docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_getclient $CLIENT | sed 's/auth-user-pass/auth-user-pass \/client\/credentials.txt/' | tee $CLIENT_DIR/config.ovpn
+
+# Ensure reneg-sec 0 in client config when two factor is enabled
+grep 'reneg-sec 0' $CLIENT_DIR/config.ovpn || abort 'reneg-sec not set to 0 in client config'

 #
 # Fire up the server
@ -46,20 +52,20 @@ docker run --volumes-from $OVPN_DATA --rm $IMG ovpn_getclient $CLIENT | sed 's/a
 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 &
+docker run --name "ovpn-test" -v $OVPN_DATA:/etc/openvpn --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
+#sed -ie s:SERV_IP:$SERV_IP:g $CLIENT_DIR/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
+docker run --rm --net=host --privileged --volume $CLIENT_DIR:/client $IMG /client/wait-for-connect.sh

 #
 # Client either connected or timed out, kill server
--- a/test/tests/paranoid/container.sh
+++ b/test/tests/paranoid/container.sh
@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
+
+#
+# Generate a simple configuration, returns nonzero on error
+#
+ovpn_genconfig -u udp://$SERV_IP 2>/dev/null
+
+export EASYRSA_BATCH=1
+export EASYRSA_REQ_CN="Travis-CI Test CA"
+
+#
+# Initialize the certificate PKI state, returns nonzero on error
+#
+ovpn_initpki nopass 2>/dev/null
+
+#
+# Test back-up
+#
+ovpn_copy_server_files
--- a/test/tests/paranoid/run.sh
+++ b/test/tests/paranoid/run.sh
@ -0,0 +1 @@
+../run-bash-in-container.sh
--- a/test/tests/revocation/run.sh
+++ b/test/tests/revocation/run.sh
@ -0,0 +1,101 @@
+#!/bin/bash
+set -e
+
+[ -n "${DEBUG+x}" ] && set -x
+
+OVPN_DATA="basic-data"
+CLIENT1="travis-client1"
+CLIENT2="travis-client2"
+IMG="kylemanna/openvpn"
+NAME="ovpn-test"
+CLIENT_DIR="$(readlink -f "$(dirname "$BASH_SOURCE")/../../client")"
+SERV_IP="$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)"
+
+#
+# Initialize openvpn configuration and pki.
+#
+docker volume create --name $OVPN_DATA
+docker run --rm -v $OVPN_DATA:/etc/openvpn $IMG ovpn_genconfig -u udp://$SERV_IP
+docker run --rm -v $OVPN_DATA:/etc/openvpn -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
+
+#
+# Fire up the server.
+#
+sudo iptables -N DOCKER || echo 'Firewall already configured'
+sudo iptables -I FORWARD 1 -j DOCKER
+docker run -d -v $OVPN_DATA:/etc/openvpn --cap-add=NET_ADMIN --privileged -p 1194:1194/udp --name $NAME $IMG
+
+
+#
+# Test that easy_rsa generate CRLs with 'next publish' set to 3650 days.
+#
+crl_next_update="$(docker exec $NAME openssl crl -nextupdate -noout -in /etc/openvpn/crl.pem | cut -d'=' -f2 | tr -d 'GMT')"
+crl_next_update="$(date -u -d "$crl_next_update" "+%s")"
+now="$(docker exec $NAME date "+%s")"
+crl_remain="$(( $crl_next_update - $now ))"
+crl_remain="$(( $crl_remain / 86400 ))"
+if (( $crl_remain < 3649 )); then
+    echo "easy_rsa CRL next publish set to less than 3650 days." >&2
+    exit 2
+fi
+
+#
+# Generate a first client certificate and configuration using $CLIENT1 as CN then revoke it.
+#
+docker exec -it $NAME easyrsa build-client-full $CLIENT1 nopass
+docker exec -it $NAME ovpn_getclient $CLIENT1 > $CLIENT_DIR/config.ovpn
+docker exec -it $NAME bash -c "echo 'yes' | ovpn_revokeclient $CLIENT1 remove"
+
+#
+# Test that openvpn client can't connect using $CLIENT1 config.
+#
+if docker run --rm -v $CLIENT_DIR:/client --cap-add=NET_ADMIN --privileged --net=host $IMG /client/wait-for-connect.sh; then
+    echo "Client was able to connect after revocation test #1." >&2
+    exit 2
+fi
+
+#
+# Generate and revoke a second client certificate using $CLIENT2 as CN, then test for failed client connection.
+#
+docker exec -it $NAME easyrsa build-client-full $CLIENT2 nopass
+docker exec -it $NAME ovpn_getclient $CLIENT2 > $CLIENT_DIR/config.ovpn
+docker exec -it $NAME bash -c "echo 'yes' | ovpn_revokeclient $CLIENT2 remove"
+
+if docker run --rm -v $CLIENT_DIR:/client --cap-add=NET_ADMIN --privileged --net=host $IMG /client/wait-for-connect.sh; then
+    echo "Client was able to connect after revocation test #2." >&2
+    exit 2
+fi
+
+#
+# Restart the server
+#
+docker stop $NAME && docker start $NAME
+
+#
+# Test for failed connection using $CLIENT2 config again.
+#
+if docker run --rm -v $CLIENT_DIR:/client --cap-add=NET_ADMIN --privileged --net=host $IMG /client/wait-for-connect.sh; then
+    echo "Client was able to connect after revocation test #3." >&2
+    exit 2
+fi
+
+#
+# Stop the server and clean up
+#
+docker kill $NAME && docker rm $NAME
+docker volume rm $OVPN_DATA
+sudo iptables -D FORWARD 1
+
+#
+# Celebrate
+#
+cat <<EOF
+ ___________
+< it worked >
+ -----------
+        \   ^__^
+         \  (oo)\_______
+            (__)\       )\/\\
+                ||----w |
+                ||     ||
+EOF
--- a/test/tests/run-bash-in-container.sh
+++ b/test/tests/run-bash-in-container.sh
@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+testDir="$(readlink -f "$(dirname "$BASH_SOURCE")")"
+runDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+source "$runDir/run-in-container.sh" "$testDir" "$1" bash ./container.sh
--- a/test/tests/run-in-container.sh
+++ b/test/tests/run-in-container.sh
@ -0,0 +1,46 @@
+#!/bin/bash
+set -e
+
+# NOT INTENDED TO BE USED AS A TEST "run.sh" DIRECTLY
+# SEE OTHER "run-*-in-container.sh" SCRIPTS FOR USAGE
+
+testDir="$1"
+shift
+
+image="$1"
+shift
+entrypoint="$1"
+shift
+
+# do some fancy footwork so that if testDir is /a/b/c, we mount /a/b and use c as the working directory (so relative symlinks work one level up)
+thisDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+testDir="$(readlink -f "$testDir")"
+testBase="$(basename "$testDir")"
+hostMount="$(dirname "$testDir")"
+containerMount="/tmp/test-dir"
+workdir="$containerMount/$testBase"
+# TODO should we be doing something fancy with $BASH_SOURCE instead so we can be arbitrarily deep and mount the top level always?
+
+newImage="$("$thisDir/image-name.sh" librarytest/run-in-container "$image--$testBase")"
+"$thisDir/docker-build.sh" "$hostMount" "$newImage" <<EOD
+FROM $image
+COPY dir $containerMount
+WORKDIR $workdir
+ENTRYPOINT ["$entrypoint"]
+EOD
+
+args=( --rm )
+
+# there is strong potential for nokogiri+overlayfs failure
+# see https://github.com/docker-library/ruby/issues/55
+gemHome="$(docker inspect -f '{{range .Config.Env}}{{println .}}{{end}}' "$newImage" | awk -F '=' '$1 == "GEM_HOME" { print $2; exit }')"
+if [ "$gemHome" ]; then
+	# must be a Ruby image
+	driver="$(docker info | awk -F ': ' '$1 == "Storage Driver" { print $2; exit }')"
+	if [ "$driver" = 'overlay' ]; then
+		# let's add a volume (_not_ a bind mount) on GEM_HOME to work around nokogiri+overlayfs issues
+		args+=( -v "$gemHome" )
+	fi
+fi
+
+exec docker run "${args[@]}" "$newImage" "$@"
--- 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/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