Merge pull request #1 from haugene/master

Merge latest changes
2025-08-31 19:31:13 +02:00 · 2020-11-15 20:48:24 -06:00 · 2020-11-15 20:48:24 -06:00 · 8d799b9e21
commit 8d799b9e21
parent 954610854e 93d0141d92
1880 changed files with 784 additions and 43767 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -12,34 +12,7 @@ workflows:
  # Defines workflow for when to build the different Docker images
  build-docker-images:
    jobs:
-      - build-ubuntu-image:
-          context: dockerhub
-          filters:
-            branches:
-              only:
-                - dev
-                - master
-            tags:
-              only: /^\d+\.\d+.*/
-      - build-alpine-image:
-          context: dockerhub
-          filters:
-            branches:
-              only:
-                - dev
-                - master
-            tags:
-              only: /^\d+\.\d+.*/
-      - build-armhf-image:
-          context: dockerhub
-          filters:
-            branches:
-              only:
-                - dev
-                - master
-            tags:
-              only: /^\d+\.\d+.*/
-      - build-arm64-image:
+      - build-with-buildx:
          context: dockerhub
          filters:
            branches:
@ -51,94 +24,33 @@ workflows:

 # Job definitions, used by the workflows.
 jobs:
-  build-ubuntu-image:
-    environment:
-      IMAGE_NAME: haugene/transmission-openvpn
-    docker:
-      - image: circleci/buildpack-deps:stretch
+  build-with-buildx:
+    machine:
+      image: ubuntu-2004:202010-01
    steps:
      - checkout
-      - setup_remote_docker
-      - calculate-tag-name:
-          distro: ubuntu
+      - run: sudo apt update && sudo apt install -y qemu-user
      - run:
-          name: Build Docker image
-          command: docker build -t $IMAGE_NAME:$IMAGE_TAG .
-      - run:
-          name: Login to Docker Hub
-          command: echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
-      - run:
-          name: Push image
-          command: docker push $IMAGE_NAME:$IMAGE_TAG
-
-  build-alpine-image:
-    environment:
-      IMAGE_NAME: haugene/transmission-openvpn
-    docker:
-      - image: circleci/buildpack-deps:stretch
-    steps:
-      - checkout
-      - setup_remote_docker
-      - calculate-tag-name:
-          distro: alpine
-      - run:
-          name: Build Docker image
-          command: docker build -t $IMAGE_NAME:$IMAGE_TAG -f Dockerfile.alpine .
-      - run:
-          name: Login to Docker Hub
-          command: echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
-      - run:
-          name: Push image
-          command: docker push $IMAGE_NAME:$IMAGE_TAG
-
-  build-armhf-image:
-    environment:
-      IMAGE_NAME: haugene/transmission-openvpn
-    docker:
-      - image: circleci/buildpack-deps:stretch
-    steps:
-      - checkout
-      - setup_remote_docker
-      - calculate-tag-name:
-          distro: armhf
-      - run:
-          name: Build Docker image
+          name: Download and install docker-buildx plugin
          command: |
-            echo "Un-commenting cross-build instructions in Dockerfile.armhf"
-            sed -i 's/^#\(.*cross-build.*\)/\1/' Dockerfile.armhf
-            docker build -t $IMAGE_NAME:$IMAGE_TAG -f Dockerfile.armhf .
+            mkdir -p ~/.docker/cli-plugins
+            curl -sSL https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
+            chmod a+x ~/.docker/cli-plugins/docker-buildx
      - run:
          name: Login to Docker Hub
          command: echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
+      - calculate-tag-name
      - run:
-          name: Push image
-          command: docker push $IMAGE_NAME:$IMAGE_TAG
-
-  build-arm64-image:
-    environment:
-      IMAGE_NAME: haugene/transmission-openvpn
-    docker:
-      - image: circleci/buildpack-deps:stretch
-    steps:
-      - checkout
-      - setup_remote_docker
-      - calculate-tag-name:
-          distro: arm64
-      - run:
-          name: Build Docker image
+          name: Set up buildx and build/push images
          command: |
-            echo "Un-commenting cross-build instructions in Dockerfile.armhf"
-            sed -i 's/^#\(.*cross-build.*\)/\1/' Dockerfile.armhf
-            docker build \
-              -t $IMAGE_NAME:$IMAGE_TAG \
-              -f Dockerfile.armhf \
-              --build-arg base_image=balenalib/raspberrypi3-64:stretch .
-      - run:
-          name: Login to Docker Hub
-          command: echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
-      - run:
-          name: Push image
-          command: docker push $IMAGE_NAME:$IMAGE_TAG
+            docker buildx create --name mybuilder
+            docker buildx use mybuilder
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            docker buildx ls
+            docker buildx build -t haugene/transmission-openvpn:$IMAGE_TAG --progress plain \
+              --platform linux/arm,linux/arm64,linux/amd64 \
+              --build-arg REVISION=$CIRCLE_SHA1 \
+              --push .

  build-and-deploy-gh-pages:
    docker:
@ -158,9 +70,6 @@ jobs:
 commands:
  calculate-tag-name:
    description: "Calculates the target tag name for Docker image"
-    parameters:
-      distro:
-        type: string
    steps:
      - run:
          name: Calculate tag to set for the built Docker image
@ -173,10 +82,4 @@ commands:
              TAG_VERSION=$CIRCLE_BRANCH;
            fi

-            if [ "<< parameters.distro >>" = "ubuntu" ]; then
-              TAG_DISTRO="";
-            else
-              TAG_DISTRO=-<< parameters.distro >>;
-            fi
-
            echo "export IMAGE_TAG=$TAG_VERSION$TAG_DISTRO" >> $BASH_ENV
--- a/2
+++ b/2
@ -87,4 +87,4 @@
 #WEBPROXY_PORT=8888
 #WEBPROXY_USERNAME=
 #WEBPROXY_PASSWORD=
-#DOCKER_LOG=false
+#LOG_TO_STDOUT=false
--- a/136
+++ b/136
@ -1,43 +1,29 @@
-FROM ubuntu:19.10
+FROM alpine:3.12

 VOLUME /data
 VOLUME /config

-ARG DOCKERIZE_ARCH=amd64
-ARG DOCKERIZE_VERSION=v0.6.1
-ARG DUMBINIT_VERSION=1.2.2
-
-# Required for omitting the tzdata configuration dialog
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Update, upgrade and install core software
-RUN apt update \
-    && apt -y install apt-utils software-properties-common wget git curl jq \
-    && add-apt-repository ppa:transmissionbt/ppa \
-    && apt update \
-    && apt install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip ufw iputils-ping openvpn bc tzdata bash \
-    python2.7 python2.7-pysqlite2 && ln -sf /usr/bin/python2.7 /usr/bin/python2 \
-    && apt -y upgrade \
-    && wget https://github.com/Secretmapper/combustion/archive/release.zip \
-    && unzip release.zip -d /opt/transmission-ui/ \
-    && rm release.zip \
+RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+    && apk --no-cache add bash dumb-init ip6tables ufw@community openvpn shadow transmission-daemon transmission-cli curl jq tzdata openrc tinyproxy tinyproxy-openrc openssh unrar \
+    && mkdir -p /opt/transmission-ui \
+    && echo "Install Combustion" \
+    && wget -qO- https://github.com/Secretmapper/combustion/archive/release.tar.gz | tar xz -C /opt/transmission-ui \
+    && echo "Install kettu" \
+    && wget -qO- https://github.com/endor/kettu/archive/master.tar.gz | tar xz -C /opt/transmission-ui \
+    && mv /opt/transmission-ui/kettu-master /opt/transmission-ui/kettu \
+    && echo "Install Transmission-Web-Control" \
    && mkdir /opt/transmission-ui/transmission-web-control \
    && curl -sL `curl -s https://api.github.com/repos/ronggang/transmission-web-control/releases/latest | jq --raw-output '.tarball_url'` | tar -C /opt/transmission-ui/transmission-web-control/ --strip-components=2 -xz \
    && ln -s /usr/share/transmission/web/style /opt/transmission-ui/transmission-web-control \
    && ln -s /usr/share/transmission/web/images /opt/transmission-ui/transmission-web-control \
    && ln -s /usr/share/transmission/web/javascript /opt/transmission-ui/transmission-web-control \
    && ln -s /usr/share/transmission/web/index.html /opt/transmission-ui/transmission-web-control/index.original.html \
-    && git clone git://github.com/endor/kettu.git /opt/transmission-ui/kettu \
-    && apt install -y tinyproxy telnet vim \
-    && wget https://github.com/Yelp/dumb-init/releases/download/v${DUMBINIT_VERSION}/dumb-init_${DUMBINIT_VERSION}_amd64.deb \
-    && dpkg -i dumb-init_${DUMBINIT_VERSION}_amd64.deb \
-    && rm -rf dumb-init_${DUMBINIT_VERSION}_amd64.deb \
-    && curl -L https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-linux-${DOCKERIZE_ARCH}-${DOCKERIZE_VERSION}.tar.gz | tar -C /usr/local/bin -xzv \
-    && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && rm -rf /tmp/* /var/tmp/* \
    && groupmod -g 1000 users \
    && useradd -u 911 -U -d /config -s /bin/false abc \
    && usermod -G users abc

+# Add configuration and scripts
 ADD openvpn/ /etc/openvpn/
 ADD transmission/ /etc/transmission/
 ADD tinyproxy /opt/tinyproxy/
@ -47,100 +33,38 @@ ENV OPENVPN_USERNAME=**None** \
    OPENVPN_PASSWORD=**None** \
    OPENVPN_PROVIDER=**None** \
    GLOBAL_APPLY_PERMISSIONS=true \
-    TRANSMISSION_ALT_SPEED_DOWN=50 \
-    TRANSMISSION_ALT_SPEED_ENABLED=false \
-    TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \
-    TRANSMISSION_ALT_SPEED_TIME_DAY=127 \
-    TRANSMISSION_ALT_SPEED_TIME_ENABLED=false \
-    TRANSMISSION_ALT_SPEED_TIME_END=1020 \
-    TRANSMISSION_ALT_SPEED_UP=50 \
-    TRANSMISSION_BIND_ADDRESS_IPV4=0.0.0.0 \
-    TRANSMISSION_BIND_ADDRESS_IPV6=:: \
-    TRANSMISSION_BLOCKLIST_ENABLED=false \
-    TRANSMISSION_BLOCKLIST_URL=http://www.example.com/blocklist \
-    TRANSMISSION_CACHE_SIZE_MB=4 \
-    TRANSMISSION_DHT_ENABLED=true \
-    TRANSMISSION_DOWNLOAD_DIR=/data/completed \
-    TRANSMISSION_DOWNLOAD_LIMIT=100 \
-    TRANSMISSION_DOWNLOAD_LIMIT_ENABLED=0 \
-    TRANSMISSION_DOWNLOAD_QUEUE_ENABLED=true \
-    TRANSMISSION_DOWNLOAD_QUEUE_SIZE=5 \
-    TRANSMISSION_ENCRYPTION=1 \
-    TRANSMISSION_IDLE_SEEDING_LIMIT=30 \
-    TRANSMISSION_IDLE_SEEDING_LIMIT_ENABLED=false \
-    TRANSMISSION_INCOMPLETE_DIR=/data/incomplete \
-    TRANSMISSION_INCOMPLETE_DIR_ENABLED=true \
-    TRANSMISSION_LPD_ENABLED=false \
-    TRANSMISSION_MAX_PEERS_GLOBAL=200 \
-    TRANSMISSION_MESSAGE_LEVEL=2 \
-    TRANSMISSION_PEER_CONGESTION_ALGORITHM= \
-    TRANSMISSION_PEER_ID_TTL_HOURS=6 \
-    TRANSMISSION_PEER_LIMIT_GLOBAL=200 \
-    TRANSMISSION_PEER_LIMIT_PER_TORRENT=50 \
-    TRANSMISSION_PEER_PORT=51413 \
-    TRANSMISSION_PEER_PORT_RANDOM_HIGH=65535 \
-    TRANSMISSION_PEER_PORT_RANDOM_LOW=49152 \
-    TRANSMISSION_PEER_PORT_RANDOM_ON_START=false \
-    TRANSMISSION_PEER_SOCKET_TOS=default \
-    TRANSMISSION_PEX_ENABLED=true \
-    TRANSMISSION_PORT_FORWARDING_ENABLED=false \
-    TRANSMISSION_PREALLOCATION=1 \
-    TRANSMISSION_PREFETCH_ENABLED=1 \
-    TRANSMISSION_QUEUE_STALLED_ENABLED=true \
-    TRANSMISSION_QUEUE_STALLED_MINUTES=30 \
-    TRANSMISSION_RATIO_LIMIT=2 \
-    TRANSMISSION_RATIO_LIMIT_ENABLED=false \
-    TRANSMISSION_RENAME_PARTIAL_FILES=true \
-    TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false \
-    TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0 \
-    TRANSMISSION_RPC_ENABLED=true \
-    TRANSMISSION_RPC_HOST_WHITELIST= \
-    TRANSMISSION_RPC_HOST_WHITELIST_ENABLED=false \
-    TRANSMISSION_RPC_PASSWORD=password \
-    TRANSMISSION_RPC_PORT=9091 \
-    TRANSMISSION_RPC_URL=/transmission/ \
-    TRANSMISSION_RPC_USERNAME=username \
-    TRANSMISSION_RPC_WHITELIST=127.0.0.1 \
-    TRANSMISSION_RPC_WHITELIST_ENABLED=false \
-    TRANSMISSION_SCRAPE_PAUSED_TORRENTS_ENABLED=true \
-    TRANSMISSION_SCRIPT_TORRENT_DONE_ENABLED=false \
-    TRANSMISSION_SCRIPT_TORRENT_DONE_FILENAME= \
-    TRANSMISSION_SEED_QUEUE_ENABLED=false \
-    TRANSMISSION_SEED_QUEUE_SIZE=10 \
-    TRANSMISSION_SPEED_LIMIT_DOWN=100 \
-    TRANSMISSION_SPEED_LIMIT_DOWN_ENABLED=false \
-    TRANSMISSION_SPEED_LIMIT_UP=100 \
-    TRANSMISSION_SPEED_LIMIT_UP_ENABLED=false \
-    TRANSMISSION_START_ADDED_TORRENTS=true \
-    TRANSMISSION_TRASH_ORIGINAL_TORRENT_FILES=false \
-    TRANSMISSION_UMASK=2 \
-    TRANSMISSION_UPLOAD_LIMIT=100 \
-    TRANSMISSION_UPLOAD_LIMIT_ENABLED=0 \
-    TRANSMISSION_UPLOAD_SLOTS_PER_TORRENT=14 \
-    TRANSMISSION_UTP_ENABLED=false \
-    TRANSMISSION_WATCH_DIR=/data/watch \
-    TRANSMISSION_WATCH_DIR_ENABLED=true \
    TRANSMISSION_HOME=/data/transmission-home \
-    TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false \
+    TRANSMISSION_RPC_PORT=9091 \
+    TRANSMISSION_DOWNLOAD_DIR=/data/completed \
+    TRANSMISSION_INCOMPLETE_DIR=/data/incomplete \
+    TRANSMISSION_WATCH_DIR=/data/watch \
+    CREATE_TUN_DEVICE=true \
    ENABLE_UFW=false \
    UFW_ALLOW_GW_NET=false \
    UFW_EXTRA_PORTS= \
    UFW_DISABLE_IPTABLES_REJECT=false \
-    TRANSMISSION_WEB_UI= \
    PUID= \
    PGID= \
-    TRANSMISSION_WEB_HOME= \
    DROP_DEFAULT_ROUTE= \
    WEBPROXY_ENABLED=false \
    WEBPROXY_PORT=8888 \
    WEBPROXY_USERNAME= \
    WEBPROXY_PASSWORD= \
-    HEALTH_CHECK_HOST=google.com \
-    DOCKER_LOG=false
+    LOG_TO_STDOUT=false \
+    HEALTH_CHECK_HOST=google.com

-HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh
+HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh
+
+# Add labels to identify this image and version
+ARG REVISION
+# Set env from build argument or default to empty string
+ENV REVISION=${REVISION:-""}
+LABEL org.opencontainers.image.source=https://github.com/haugene/docker-transmission-openvpn
+LABEL org.opencontainers.image.revision=$REVISION
+
+# Compatability with https://hub.docker.com/r/willfarrell/autoheal/
+LABEL autoheal=true

 # Expose port and run
 EXPOSE 9091
-EXPOSE 8888
 CMD ["dumb-init", "/etc/openvpn/start.sh"]
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@ -1,135 +0,0 @@
-FROM alpine:3.12
-
-VOLUME /data
-VOLUME /config
-
-ARG DOCKERIZE_ARCH=amd64
-ENV DOCKERIZE_VERSION=v0.6.0
-RUN echo "@community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
-    && apk --no-cache add bash dumb-init ip6tables ufw@community openvpn shadow transmission-daemon transmission-cli curl jq tzdata openrc tinyproxy tinyproxy-openrc\
-    && echo "Install dockerize $DOCKERIZE_VERSION ($DOCKERIZE_ARCH)" \
-    && wget -qO- https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-$DOCKERIZE_ARCH-$DOCKERIZE_VERSION.tar.gz | tar xz -C /usr/bin \
-    && mkdir -p /opt/transmission-ui \
-    && echo "Install Combustion" \
-    && wget -qO- https://github.com/Secretmapper/combustion/archive/release.tar.gz | tar xz -C /opt/transmission-ui \
-    && echo "Install kettu" \
-    && wget -qO- https://github.com/endor/kettu/archive/master.tar.gz | tar xz -C /opt/transmission-ui \
-    && mv /opt/transmission-ui/kettu-master /opt/transmission-ui/kettu \
-    && echo "Install Transmission-Web-Control" \
-    && mkdir /opt/transmission-ui/transmission-web-control \
-    && curl -sL `curl -s https://api.github.com/repos/ronggang/transmission-web-control/releases/latest | jq --raw-output '.tarball_url'` | tar -C /opt/transmission-ui/transmission-web-control/ --strip-components=2 -xz \
-    && ln -s /usr/share/transmission/web/style /opt/transmission-ui/transmission-web-control \
-    && ln -s /usr/share/transmission/web/images /opt/transmission-ui/transmission-web-control \
-    && ln -s /usr/share/transmission/web/javascript /opt/transmission-ui/transmission-web-control \
-    && ln -s /usr/share/transmission/web/index.html /opt/transmission-ui/transmission-web-control/index.original.html \
-    && rm -rf /tmp/* /var/tmp/* \
-    && groupmod -g 1000 users \
-    && useradd -u 911 -U -d /config -s /bin/false abc \
-    && usermod -G users abc
-
-# Add configuration and scripts
-ADD openvpn/ /etc/openvpn/
-ADD transmission/ /etc/transmission/
-ADD tinyproxy /opt/tinyproxy/
-ADD scripts /etc/scripts/
-
-ENV OPENVPN_USERNAME=**None** \
-    OPENVPN_PASSWORD=**None** \
-    OPENVPN_PROVIDER=**None** \
-    GLOBAL_APPLY_PERMISSIONS=true \
-    TRANSMISSION_ALT_SPEED_DOWN=50 \
-    TRANSMISSION_ALT_SPEED_ENABLED=false \
-    TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \
-    TRANSMISSION_ALT_SPEED_TIME_DAY=127 \
-    TRANSMISSION_ALT_SPEED_TIME_ENABLED=false \
-    TRANSMISSION_ALT_SPEED_TIME_END=1020 \
-    TRANSMISSION_ALT_SPEED_UP=50 \
-    TRANSMISSION_BIND_ADDRESS_IPV4=0.0.0.0 \
-    TRANSMISSION_BIND_ADDRESS_IPV6=:: \
-    TRANSMISSION_BLOCKLIST_ENABLED=false \
-    TRANSMISSION_BLOCKLIST_URL=http://www.example.com/blocklist \
-    TRANSMISSION_CACHE_SIZE_MB=4 \
-    TRANSMISSION_DHT_ENABLED=true \
-    TRANSMISSION_DOWNLOAD_DIR=/data/completed \
-    TRANSMISSION_DOWNLOAD_LIMIT=100 \
-    TRANSMISSION_DOWNLOAD_LIMIT_ENABLED=0 \
-    TRANSMISSION_DOWNLOAD_QUEUE_ENABLED=true \
-    TRANSMISSION_DOWNLOAD_QUEUE_SIZE=5 \
-    TRANSMISSION_ENCRYPTION=1 \
-    TRANSMISSION_IDLE_SEEDING_LIMIT=30 \
-    TRANSMISSION_IDLE_SEEDING_LIMIT_ENABLED=false \
-    TRANSMISSION_INCOMPLETE_DIR=/data/incomplete \
-    TRANSMISSION_INCOMPLETE_DIR_ENABLED=true \
-    TRANSMISSION_LPD_ENABLED=false \
-    TRANSMISSION_MAX_PEERS_GLOBAL=200 \
-    TRANSMISSION_MESSAGE_LEVEL=2 \
-    TRANSMISSION_PEER_CONGESTION_ALGORITHM= \
-    TRANSMISSION_PEER_ID_TTL_HOURS=6 \
-    TRANSMISSION_PEER_LIMIT_GLOBAL=200 \
-    TRANSMISSION_PEER_LIMIT_PER_TORRENT=50 \
-    TRANSMISSION_PEER_PORT=51413 \
-    TRANSMISSION_PEER_PORT_RANDOM_HIGH=65535 \
-    TRANSMISSION_PEER_PORT_RANDOM_LOW=49152 \
-    TRANSMISSION_PEER_PORT_RANDOM_ON_START=false \
-    TRANSMISSION_PEER_SOCKET_TOS=default \
-    TRANSMISSION_PEX_ENABLED=true \
-    TRANSMISSION_PORT_FORWARDING_ENABLED=false \
-    TRANSMISSION_PREALLOCATION=1 \
-    TRANSMISSION_PREFETCH_ENABLED=1 \
-    TRANSMISSION_QUEUE_STALLED_ENABLED=true \
-    TRANSMISSION_QUEUE_STALLED_MINUTES=30 \
-    TRANSMISSION_RATIO_LIMIT=2 \
-    TRANSMISSION_RATIO_LIMIT_ENABLED=false \
-    TRANSMISSION_RENAME_PARTIAL_FILES=true \
-    TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false \
-    TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0 \
-    TRANSMISSION_RPC_ENABLED=true \
-    TRANSMISSION_RPC_HOST_WHITELIST= \
-    TRANSMISSION_RPC_HOST_WHITELIST_ENABLED=false \
-    TRANSMISSION_RPC_PASSWORD=password \
-    TRANSMISSION_RPC_PORT=9091 \
-    TRANSMISSION_RPC_URL=/transmission/ \
-    TRANSMISSION_RPC_USERNAME=username \
-    TRANSMISSION_RPC_WHITELIST=127.0.0.1 \
-    TRANSMISSION_RPC_WHITELIST_ENABLED=false \
-    TRANSMISSION_SCRAPE_PAUSED_TORRENTS_ENABLED=true \
-    TRANSMISSION_SCRIPT_TORRENT_DONE_ENABLED=false \
-    TRANSMISSION_SCRIPT_TORRENT_DONE_FILENAME= \
-    TRANSMISSION_SEED_QUEUE_ENABLED=false \
-    TRANSMISSION_SEED_QUEUE_SIZE=10 \
-    TRANSMISSION_SPEED_LIMIT_DOWN=100 \
-    TRANSMISSION_SPEED_LIMIT_DOWN_ENABLED=false \
-    TRANSMISSION_SPEED_LIMIT_UP=100 \
-    TRANSMISSION_SPEED_LIMIT_UP_ENABLED=false \
-    TRANSMISSION_START_ADDED_TORRENTS=true \
-    TRANSMISSION_TRASH_ORIGINAL_TORRENT_FILES=false \
-    TRANSMISSION_UMASK=2 \
-    TRANSMISSION_UPLOAD_LIMIT=100 \
-    TRANSMISSION_UPLOAD_LIMIT_ENABLED=0 \
-    TRANSMISSION_UPLOAD_SLOTS_PER_TORRENT=14 \
-    TRANSMISSION_UTP_ENABLED=false \
-    TRANSMISSION_WATCH_DIR=/data/watch \
-    TRANSMISSION_WATCH_DIR_ENABLED=true \
-    TRANSMISSION_HOME=/data/transmission-home \
-    TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false \
-    ENABLE_UFW=false \
-    UFW_ALLOW_GW_NET=false \
-    UFW_EXTRA_PORTS= \
-    UFW_DISABLE_IPTABLES_REJECT=false \
-    TRANSMISSION_WEB_UI= \
-    PUID= \
-    PGID= \
-    TRANSMISSION_WEB_HOME= \
-    DROP_DEFAULT_ROUTE= \
-    WEBPROXY_ENABLED=false \
-    WEBPROXY_PORT=8888 \
-    WEBPROXY_USERNAME= \
-    WEBPROXY_PASSWORD= \
-    DOCKER_LOG=false \
-    HEALTH_CHECK_HOST=google.com
-
-HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh
-
-# Expose port and run
-EXPOSE 9091
-CMD ["dumb-init", "/etc/openvpn/start.sh"]
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@ -1,142 +0,0 @@
-ARG base_image=balenalib/raspberry-pi:buster
-FROM $base_image
-
-# For building on x86 machines. CircleCI un-comments before building
-#RUN [ "cross-build-start" ]
-
-VOLUME /data
-VOLUME /config
-
-# Update packages and install software
-RUN apt-get update \
-    && apt-get -y install apt-utils transmission-cli transmission-common transmission-daemon \
-    && apt-get install -y dumb-init unzip p7zip-full p7zip openvpn curl ufw git tinyproxy jq bash \
-    && apt-get -y upgrade \
-    && curl -L -o /tmp/release.zip https://github.com/Secretmapper/combustion/archive/release.zip \
-    && unzip /tmp/release.zip -d /opt/transmission-ui/ \
-    && rm /tmp/release.zip \
-    && git clone git://github.com/endor/kettu.git /opt/transmission-ui/kettu \
-    && mkdir /opt/transmission-ui/transmission-web-control \
-    && curl -sL `curl -s https://api.github.com/repos/ronggang/transmission-web-control/releases/latest | jq --raw-output '.tarball_url'` | tar -C /opt/transmission-ui/transmission-web-control/ --strip-components=2 -xz \
-    && ln -s /usr/share/transmission/web/style /opt/transmission-ui/transmission-web-control \
-    && ln -s /usr/share/transmission/web/images /opt/transmission-ui/transmission-web-control \
-    && ln -s /usr/share/transmission/web/javascript /opt/transmission-ui/transmission-web-control \
-    && ln -s /usr/share/transmission/web/index.html /opt/transmission-ui/transmission-web-control/index.original.html \
-    && apt-get purge git \
-    && apt-get autoremove --purge \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.0/dockerize-linux-armhf-v0.6.0.tar.gz \
-     | tar -C /usr/local/bin -xzv \
-    && groupmod -g 1000 users \
-    && useradd -u 911 -U -d /config -s /bin/false abc \
-    && usermod -G users abc
-
-# Add configuration and scripts
-ADD openvpn/ /etc/openvpn/
-ADD transmission/ /etc/transmission/
-ADD tinyproxy /opt/tinyproxy/
-ADD scripts /etc/scripts/
-
-ENV OPENVPN_USERNAME=**None** \
-    OPENVPN_PASSWORD=**None** \
-    OPENVPN_PROVIDER=**None** \
-    GLOBAL_APPLY_PERMISSIONS=true \
-    TRANSMISSION_ALT_SPEED_DOWN=50 \
-    TRANSMISSION_ALT_SPEED_ENABLED=false \
-    TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \
-    TRANSMISSION_ALT_SPEED_TIME_DAY=127 \
-    TRANSMISSION_ALT_SPEED_TIME_ENABLED=false \
-    TRANSMISSION_ALT_SPEED_TIME_END=1020 \
-    TRANSMISSION_ALT_SPEED_UP=50 \
-    TRANSMISSION_BIND_ADDRESS_IPV4=0.0.0.0 \
-    TRANSMISSION_BIND_ADDRESS_IPV6=:: \
-    TRANSMISSION_BLOCKLIST_ENABLED=false \
-    TRANSMISSION_BLOCKLIST_URL=http://www.example.com/blocklist \
-    TRANSMISSION_CACHE_SIZE_MB=4 \
-    TRANSMISSION_DHT_ENABLED=true \
-    TRANSMISSION_DOWNLOAD_DIR=/data/completed \
-    TRANSMISSION_DOWNLOAD_LIMIT=100 \
-    TRANSMISSION_DOWNLOAD_LIMIT_ENABLED=0 \
-    TRANSMISSION_DOWNLOAD_QUEUE_ENABLED=true \
-    TRANSMISSION_DOWNLOAD_QUEUE_SIZE=5 \
-    TRANSMISSION_ENCRYPTION=1 \
-    TRANSMISSION_IDLE_SEEDING_LIMIT=30 \
-    TRANSMISSION_IDLE_SEEDING_LIMIT_ENABLED=false \
-    TRANSMISSION_INCOMPLETE_DIR=/data/incomplete \
-    TRANSMISSION_INCOMPLETE_DIR_ENABLED=true \
-    TRANSMISSION_LPD_ENABLED=false \
-    TRANSMISSION_MAX_PEERS_GLOBAL=200 \
-    TRANSMISSION_MESSAGE_LEVEL=2 \
-    TRANSMISSION_PEER_CONGESTION_ALGORITHM= \
-    TRANSMISSION_PEER_ID_TTL_HOURS=6 \
-    TRANSMISSION_PEER_LIMIT_GLOBAL=200 \
-    TRANSMISSION_PEER_LIMIT_PER_TORRENT=50 \
-    TRANSMISSION_PEER_PORT=51413 \
-    TRANSMISSION_PEER_PORT_RANDOM_HIGH=65535 \
-    TRANSMISSION_PEER_PORT_RANDOM_LOW=49152 \
-    TRANSMISSION_PEER_PORT_RANDOM_ON_START=false \
-    TRANSMISSION_PEER_SOCKET_TOS=default \
-    TRANSMISSION_PEX_ENABLED=true \
-    TRANSMISSION_PORT_FORWARDING_ENABLED=false \
-    TRANSMISSION_PREALLOCATION=1 \
-    TRANSMISSION_PREFETCH_ENABLED=1 \
-    TRANSMISSION_QUEUE_STALLED_ENABLED=true \
-    TRANSMISSION_QUEUE_STALLED_MINUTES=30 \
-    TRANSMISSION_RATIO_LIMIT=2 \
-    TRANSMISSION_RATIO_LIMIT_ENABLED=false \
-    TRANSMISSION_RENAME_PARTIAL_FILES=true \
-    TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false \
-    TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0 \
-    TRANSMISSION_RPC_ENABLED=true \
-    TRANSMISSION_RPC_HOST_WHITELIST= \
-    TRANSMISSION_RPC_HOST_WHITELIST_ENABLED=false \
-    TRANSMISSION_RPC_PASSWORD=password \
-    TRANSMISSION_RPC_PORT=9091 \
-    TRANSMISSION_RPC_URL=/transmission/ \
-    TRANSMISSION_RPC_USERNAME=username \
-    TRANSMISSION_RPC_WHITELIST=127.0.0.1 \
-    TRANSMISSION_RPC_WHITELIST_ENABLED=false \
-    TRANSMISSION_SCRAPE_PAUSED_TORRENTS_ENABLED=true \
-    TRANSMISSION_SCRIPT_TORRENT_DONE_ENABLED=false \
-    TRANSMISSION_SCRIPT_TORRENT_DONE_FILENAME= \
-    TRANSMISSION_SEED_QUEUE_ENABLED=false \
-    TRANSMISSION_SEED_QUEUE_SIZE=10 \
-    TRANSMISSION_SPEED_LIMIT_DOWN=100 \
-    TRANSMISSION_SPEED_LIMIT_DOWN_ENABLED=false \
-    TRANSMISSION_SPEED_LIMIT_UP=100 \
-    TRANSMISSION_SPEED_LIMIT_UP_ENABLED=false \
-    TRANSMISSION_START_ADDED_TORRENTS=true \
-    TRANSMISSION_TRASH_ORIGINAL_TORRENT_FILES=false \
-    TRANSMISSION_UMASK=2 \
-    TRANSMISSION_UPLOAD_LIMIT=100 \
-    TRANSMISSION_UPLOAD_LIMIT_ENABLED=0 \
-    TRANSMISSION_UPLOAD_SLOTS_PER_TORRENT=14 \
-    TRANSMISSION_UTP_ENABLED=false \
-    TRANSMISSION_WATCH_DIR=/data/watch \
-    TRANSMISSION_WATCH_DIR_ENABLED=true \
-    TRANSMISSION_HOME=/data/transmission-home \
-    TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false \
-    ENABLE_UFW=false \
-    UFW_ALLOW_GW_NET=false \
-    UFW_EXTRA_PORTS= \
-    UFW_DISABLE_IPTABLES_REJECT=false \
-    TRANSMISSION_WEB_UI=\
-    PUID=\
-    PGID=\
-    TRANSMISSION_WEB_HOME= \
-    DROP_DEFAULT_ROUTE= \
-    WEBPROXY_ENABLED=false \
-    WEBPROXY_PORT=8888 \
-    WEBPROXY_USERNAME= \
-    WEBPROXY_PASSWORD= \
-    DOCKER_LOG=false \
-    HEALTH_CHECK_HOST=google.com
-
-HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh
-
-# Expose port and run
-EXPOSE 9091
-CMD ["dumb-init", "/etc/openvpn/start.sh"]
-
-# For building on x86 machines. CircleCI un-comments before building
-#RUN [ "cross-build-end" ]
--- a/README.md
+++ b/README.md
@ -4,28 +4,25 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/haugene/transmission-openvpn.svg)](https://hub.docker.com/r/haugene/transmission-openvpn/)
 [![Join the chat at https://gitter.im/docker-transmission-openvpn/Lobby](https://badges.gitter.im/docker-transmission-openvpn/Lobby.svg)](https://gitter.im/docker-transmission-openvpn/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-## Depracation Warning - changes are coming!
+## Version 3.0 released - we have some breaking changes (but not much)

-**TL;DR:** Nothing has changed yet for the `latest` tag, but there is a 3.0 version coming. Until then the `dev` tag could be more unstable than before.
+Those of you who are following this project knows that we have had some larger changes coming for a while.
+Hobby projects often get last in line for some love and care, and it took longer than I hoped but here we are.

-After years of maintaining and developing this project there are a couple of things that users keep asking about and that
-we now want to change in order to eventually make it easier for everyone.
-It looks like we will be close to 100% backwards compatible but we will probably have a couple of breaking changes where users would have to rename a config parameter or two, etc.
-
-As of now we are devoting the dev branch to development of the new version 3.0, and the master branch will continue on 2.x.
-Updates to openvpn configs and other smaller changes should be contributed to the master branch as the dev branch will not be merged into master before we have developed, tested and stabilized the new version.
-
-Some highlights on version 3.x:
+Some highlights on version 3.0:
 * We're dropping the ubuntu based image and making alpine the default (reduce double maintenance)
 * We're making Transmission settings persistent by default, removing the need for all the environment variables (but keeping support for it)
-* We're making it easier to provide your own OpenVPN (.ovpn) config file.
-* Possibly extracting the OpenVPN configs so that we can maintain that in a separate project and focus on the core in this project.
+* We're making it easier to provide your own OpenVPN (.ovpn) config file - adding scripts in the container to modify provider configs as needed to fit the container setup. (still in early stages at this point)
+* We're adding a standardized way to add scripts for doing necessary setup of a provider. This usually means to download a .ovpn config bundle, unpack it and modify it correctly to work in this container.

-These changes will not be in effect in a while yet, and I will update here when they are and provide a list of non backwards compatible changes.
-If you are following the "latest" tag, at some point it will be changed to the 3.x version and your container might break. At that point, either follow the
-upgrade guide (coming) or revert the version to the latest release on 2.x versions.
+Hopefully these changes will improve the usability of this container. As maintainers we also hope that it will free up time to keep the container up to date and stable instead of managing thousands of .ovpn files coming and going.

-The dev branch will be used for the 3.x going forwards, so to all of you following that one. You have been warned, it might be a bit unstable going forwards.
+I'll try to keep a list of breaking changes here, and add to it if we come across more:
+* The CREATE_TUN_DEVICE variable now defaults to true. Mounting /dev/net/tun will lead to an error message in the logs unless you explicitly set it to false.
+* The DOCKER_LOG variable is renamed to LOG_TO_STDOUT
+
+PS: Now more than ever. We appreciate that you report bugs and issues when you find them. But as there might be more than ususal, please make sure you search and look for a similar one before possibly creating a duplicate.
+And you can always revert back to the latest tag on the 2.x versions which is 2.14. Instead of running with `haugene/transmission-openvpn` simply use `haugene/transmission-openvpn:2.14` instead. We hope that won't be necessary though :)

 ## Quick Start

@ -36,10 +33,8 @@ It bundles configuration files for many popular VPN providers to make the setup
 ```
 $ docker run --cap-add=NET_ADMIN -d \
              -v /your/storage/path/:/data \
-              -v /etc/localtime:/etc/localtime:ro \
-              -e CREATE_TUN_DEVICE=true \
              -e OPENVPN_PROVIDER=PIA \
-              -e OPENVPN_CONFIG=CA\ Toronto \
+              -e OPENVPN_CONFIG=France \
              -e OPENVPN_USERNAME=user \
              -e OPENVPN_PASSWORD=pass \
              -e WEBPROXY_ENABLED=false \
@ -57,11 +52,9 @@ services:
    transmission-openvpn:
        volumes:
            - '/your/storage/path/:/data'
-            - '/etc/localtime:/etc/localtime:ro'
        environment:
-            - CREATE_TUN_DEVICE=true
            - OPENVPN_PROVIDER=PIA
-            - OPENVPN_CONFIG=CA Toronto
+            - OPENVPN_CONFIG=France
            - OPENVPN_USERNAME=user
            - OPENVPN_PASSWORD=pass
            - WEBPROXY_ENABLED=false
@ -83,23 +76,10 @@ The full documentation is available at https://haugene.github.io/docker-transmis
 ## Please help out (about:maintenance)
 This image was created for my own use, but sharing is caring, so it had to be open source.
 It has now gotten quite popular, and that's great! But keeping it up to date, providing support, fixes
-and new features takes a lot of time.
+and new features takes time. If you feel that you're getting a good tool and want to support it, there are a couple of options:

-I'm therefore kindly asking you to donate if you feel like you're getting a good tool
-and you're able to spare some dollars to keep it functioning as it should. There's a couple of ways to do it:
+A small montly amount through [![Donate with Patreon](images/patreon.png)](https://www.patreon.com/haugene) or
+a one time donation with [![Donate with PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=73XHRSK65KQYC)

-Become a patron, supporting the project with a small monthly amount.
-
-[![Donate with Patreon](images/patreon.png)](https://www.patreon.com/haugene)
-
-Make a one time donation through PayPal.
-
-[![Donate with PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=73XHRSK65KQYC)
-
-Or use this referral code to DigitalOcean and get 25$ in credits, if you're interested in a cloud setup.
-
-[![Credits on DigitalOcean](images/digitalocean.png)](https://m.do.co/c/ca994f1552bc)
-
-You can also help out by submitting pull-requests or helping others with
-open issues or in the gitter chat. A big thanks to everyone who has contributed so far!
-And if you could be interested in joining as collaborator, let me know.
+All donations are greatly appreciated! Another great way to contribute is of course through code.
+A big thanks to everyone who has contributed so far!
--- a/default.ovpn
+++ b/default.ovpn
@ -1 +0,0 @@
-Netherlands-256.ovpn
--- a/docs/arguments.md
+++ b/docs/arguments.md
@ -13,6 +13,15 @@
 | `LOCAL_NETWORK`     | Sets the local network that should have access. Accepts comma separated list.                       | `LOCAL_NETWORK=192.168.0.0/24`                                                                                 |
 | `CREATE_TUN_DEVICE` | Creates /dev/net/tun device inside the container, mitigates the need mount the device from the host | `CREATE_TUN_DEVICE=true`                                                                                       |

+### Timezone option
+
+Set a custom timezone in tz database format. Look [here](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) for a list of valid timezones. Defaults to UTC.
+
+| Variable                      | Function                                                                                                                    | Example                            |
+| ----------------------------- | --------------------------------------------------------------------------------------------------------------------------- | ---------------------------------- |
+| `TZ`                  | Set Timezone                                                                                                         | `TZ=UTC`                  |
+
+
 ### Firewall configuration options
 When enabled, the firewall blocks everything except traffic to the peer port and traffic to the rpc port from the LOCAL_NETWORK and the internal docker gateway.

@ -105,3 +114,11 @@ This might lead to the default route (your untunneled connection) to be used.
 To drop the default route set the environment variable `DROP_DEFAULT_ROUTE` to `true`.

 *Note*: This is not compatible with all VPNs. You can check your iptables routing with the `ip r` command in a running container.
+
+### Changing logging locations
+
+By default Transmission will log to a file in `TRANSMISSION_HOME/transmission.log`. 
+
+To log to stdout instead set the environment variable `LOG_TO_STDOUT` to `true`.
+
+*Note*: By default stdout is what container engines read logs from. Set this to true to have Tranmission logs in commands like `docker logs` and `kubectl logs`. OpenVPN currently only logs to stdout.
--- a/docs/readme.md
+++ b/docs/readme.md
@ -108,7 +108,6 @@ This is a list of providers that are bundled within the image. Feel free to crea
 | HideMe                  | `HIDEME`                          |
 | HideMyAss               | `HIDEMYASS`                       |
 | IntegrityVPN            | `INTEGRITYVPN`                    |
-| IPredator               | `IPREDATOR`                       |
 | IPVanish                | `IPVANISH`                        |
 | IronSocket              | `IRONSOCKET`                      |
 | Ivacy                   | `IVACY`                           |
--- a/docs/rss-plugin.md
+++ b/docs/rss-plugin.md
@ -1,4 +1,4 @@
-The Transmission RSS plugin can optionally be run as a separate container. It allow to download torrents based on an RSS URL, see [Plugin page](https://github.com/nning/transmission-rss).
+The Transmission RSS plugin can optionally be run as a separate container. It allows downloading torrents based on an RSS URL, see [Plugin page](https://github.com/nning/transmission-rss).

 ```
 $ docker run -d \
--- a/docs/supported-providers.md
+++ b/docs/supported-providers.md
@ -19,7 +19,6 @@ This is a list of providers that are bundled within the image. Feel free to crea
 | HideMe                  | `HIDEME`                          |
 | HideMyAss               | `HIDEMYASS`                       |
 | IntegrityVPN            | `INTEGRITYVPN`                    |
-| IPredator               | `IPREDATOR`                       |
 | IPVanish                | `IPVANISH`                        |
 | IronSocket              | `IRONSOCKET`                      |
 | Ivacy                   | `IVACY`                           |
--- a/docs/synology-nas.md
+++ b/docs/synology-nas.md
@ -1,64 +0,0 @@
-Here are the steps to run it on a Synology NAS (Tested on DSM 6) :
-
- Connect as _admin_ to your Synology SSH
- Switch to root with command `sudo su -`
- Enter your _admin_ password when prompted
- Create a TUN.sh file anywhere in your synology file system by typing `vim /volume1/foldername/TUN.sh`
-replacing _foldername_ with any folder you created on your Synology. You will also need to replace `foldername` for the commands in the remainder of this guide.
- Paste @timkelty 's script :
-```
-#!/bin/sh
-
-# Create the necessary file structure for /dev/net/tun
-if ( [ ! -c /dev/net/tun ] ); then
-  if ( [ ! -d /dev/net ] ); then
-    mkdir -m 755 /dev/net
-  fi
-  mknod /dev/net/tun c 10 200
-  chmod 0755 /dev/net/tun
-fi
-
-# Load the tun module if not already loaded
-if ( !(lsmod | grep -q "^tun\s") ); then
-  insmod /lib/modules/tun.ko
-fi
-```
- Save the file with [escape] + `:wq!`
- Go in the folder containing your script : `cd /volume1/foldername/`
- Check permission with `chmod 0755 TUN.sh`
- Run it with `./TUN.sh`
- Return to initial directory typing `cd`
- Create the DNS config file by typing `vim /volume1/foldername/resolv.conf`
- Paste the following lines :
-```
-nameserver 8.8.8.8
-nameserver 8.8.4.4
-```
- Save the file with [escape] + `:wq!`
- Create your Docker container with the following command. Note the following things you should change or may want to consider changing:
-  - If you'd like any Transmission options (for instance, stop seeding once a certain ratio has been reached) to persist across container restarts, now is the time to enter them by modifying the command below. See [here](https://haugene.github.io/docker-transmission-openvpn/arguments/#transmission_configuration_options) for details.
-  - You must change the folder paths for the paths listed in the following command.
-  - You must also specify the UID and GID of the user Transmission should run. The placeholder provided below almost certainly will not work on your system without modification. 
-```
-# Tested on DSM 6.1.4-15217 Update 1, Docker Package 17.05.0-0349
-docker run \
-    --cap-add=NET_ADMIN \
-    --device=/dev/net/tun \
-    -d \
-    -v /volume1/foldername/resolv.conf:/etc/resolv.conf \
-    -v /volume1/yourpath/:/data \
-    -e "OPENVPN_PROVIDER=PIA" \
-    -e "OPENVPN_CONFIG=CA\ Toronto" \
-    -e "OPENVPN_USERNAME=XXXXX" \
-    -e "OPENVPN_PASSWORD=XXXXX" \
-    -e "LOCAL_NETWORK=192.168.0.0/24" \
-    -e "OPENVPN_OPTS=--inactive 3600 --ping 10 --ping-exit 60" \
-    -e "PGID=100" \
-    -e "PUID=1234" \
-    -p 9091:9091 \
-    --sysctl net.ipv6.conf.all.disable_ipv6=0 \
-    --name "transmission-openvpn-syno" \
-    haugene/transmission-openvpn:latest
-```
- To make it work after a nas restart, create an automated task in your synology web interface : go to **Settings Panel > Task Scheduler ** create a new task that run `/volume1/foldername/TUN.sh` as root (select '_root_' in 'user' selectbox). This task will start module that permit the container to run, you can make a task that run on startup. These kind of task doesn't work on my nas so I just made a task that run every minute.
- Enjoy
--- a/docs/systemd-integration.md
+++ b/docs/systemd-integration.md
@ -21,12 +21,11 @@ ExecStartPre=/usr/bin/docker pull haugene/transmission-openvpn
 ExecStart=/usr/bin/docker run \
        --name transmission-openvpn \
        --cap-add=NET_ADMIN \
-        --device=/dev/net/tun \
        -v /home/bittorrent/data/:/data \
        -e "OPENVPN_PROVIDER=TORGUARD" \
        -e "OPENVPN_USERNAME=bittorrent@example.com" \
        -e "OPENVPN_PASSWORD=hunter2" \
-        -e "OPENVPN_CONFIG=CA\ Toronto" \
+        -e "OPENVPN_CONFIG=CA Toronto" \
        -e "OPENVPN_OPTS=--inactive 3600 --ping 10 --ping-exit 60" \
        -e "TRANSMISSION_UMASK=0" \
        -p 9091:9091 \
@ -53,4 +52,4 @@ If it is stopped or killed in any fashion, systemd will restart the container. I
 $ sudo systemctl stop transmission-openvpn.service
 # Later ...
 $ sudo systemctl start transmission-openvpn.service
-```
+```
--- a/mkdocs.yml
+++ b/mkdocs.yml
@ -18,7 +18,6 @@ nav:
   - 'Access': 'access.md'
   - 'Running on ARM': 'run-on-arm.md'
   - 'NORDVPN update script': 'nordvpn-script.md'
-   - 'Synology NAS': 'synology-nas.md'
   - 'Systemd integration': 'systemd-integration.md'
   - 'Known issues, tips and tricks': 'known-issues.md'
 plugins:
--- a/openvpn/freevpn/configure-openvpn.sh
+++ b/openvpn/freevpn/configure-openvpn.sh
@ -17,8 +17,7 @@ OPENVPN_IP=$(curl -s https://freevpn.${DOMAIN}/accounts/ | grep IP |  sed s/"^.*
 # freevpn.me , main server, presents two servers with different address
 # and related password to be used 
 SERVER=${OPENVPN_IP%".freevpn.${DOMAIN}"}
-PASSWORD=$(curl -s https://freevpn.${DOMAIN}/accounts/ | grep Password |  sed s/"^.*Password\:.... "/""/g | sed s/"<.*"/""/g)
-echo "${PASSWORD}" > /etc/freevpn_password
+export OPENVPN_PASSWORD=$(curl -s https://freevpn.${DOMAIN}/accounts/ | grep Password |  sed s/"^.*Password\:.... "/""/g | sed s/"<.*"/""/g)

 DIR="/tmp/freevpn"
 TARGET="/etc/openvpn/freevpn"
--- a/openvpn/frostvpn/SOURCE.txt
+++ b/openvpn/frostvpn/SOURCE.txt
@ -1 +1 @@
-http://www.frostvpn.com/clients/server-list.htm
+https://www.frostvpn.com/clients/servers.htm
--- a/openvpn/ipredator/ca.crt
+++ b/openvpn/ipredator/ca.crt
@ -1,30 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIFJzCCBA+gAwIBAgIJAKee4ZMMpvhzMA0GCSqGSIb3DQEBBQUAMIG9MQswCQYD
-VQQGEwJTRTESMBAGA1UECBMJQnJ5Z2dsYW5kMQ8wDQYDVQQHEwZPZWxkYWwxJDAi
-BgNVBAoTG1JveWFsIFN3ZWRpc2ggQmVlciBTcXVhZHJvbjESMBAGA1UECxMJSW50
-ZXJuZXR6MScwJQYDVQQDEx5Sb3lhbCBTd2VkaXNoIEJlZXIgU3F1YWRyb24gQ0Ex
-JjAkBgkqhkiG9w0BCQEWF2hvc3RtYXN0ZXJAaXByZWRhdG9yLnNlMB4XDTEyMDgw
-NDIxMTAyNVoXDTIyMDgwMjIxMTAyNVowgb0xCzAJBgNVBAYTAlNFMRIwEAYDVQQI
-EwlCcnlnZ2xhbmQxDzANBgNVBAcTBk9lbGRhbDEkMCIGA1UEChMbUm95YWwgU3dl
-ZGlzaCBCZWVyIFNxdWFkcm9uMRIwEAYDVQQLEwlJbnRlcm5ldHoxJzAlBgNVBAMT
-HlJveWFsIFN3ZWRpc2ggQmVlciBTcXVhZHJvbiBDQTEmMCQGCSqGSIb3DQEJARYX
-aG9zdG1hc3RlckBpcHJlZGF0b3Iuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCp5M22fZtwtIh6Mu9IwC3N2tEFqyNTEP1YyXasjf+7VNISqSpFy+tf
-DsHAkiE9Wbv8KFM9bOoVK1JjdDsetxArm/RNsUWm/SNyVbmY+5ezX/n95S7gQdMi
-bA74/ID2+KsCXUY+HNNUQqFpyK67S09A6r0ZwPNUDbLgGnmCZRMDBPCHCbiK6e68
-d75v6f/0nY4AyAAAyqwAELIAn6sy4rzoPbalxcO33eW0fUG/ir41qqo8BQrWKyEd
-Q9gy8tGEqbLQ+B30bhIvBh10YtWq6fgFZJzWP6K8bBJGRvioFOyQHCaVH98UjwOm
-/AqMTg7LwNrpRJGcKLHzUf3gNSHQGHfzAgMBAAGjggEmMIIBIjAdBgNVHQ4EFgQU
-pRqJxaYdvv3XGEECUqj7DJJ8ptswgfIGA1UdIwSB6jCB54AUpRqJxaYdvv3XGEEC
-Uqj7DJJ8ptuhgcOkgcAwgb0xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlCcnlnZ2xh
-bmQxDzANBgNVBAcTBk9lbGRhbDEkMCIGA1UEChMbUm95YWwgU3dlZGlzaCBCZWVy
-IFNxdWFkcm9uMRIwEAYDVQQLEwlJbnRlcm5ldHoxJzAlBgNVBAMTHlJveWFsIFN3
-ZWRpc2ggQmVlciBTcXVhZHJvbiBDQTEmMCQGCSqGSIb3DQEJARYXaG9zdG1hc3Rl
-ckBpcHJlZGF0b3Iuc2WCCQCnnuGTDKb4czAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQB8nxZJaTvMMoSG47jD2w31zt9o6nSx8XJKop/0rMMHKBe1QBUw
-/n3clGwYxBW8mTnrXHhmJkwJzA0Vh525+dkF28E0I+DSigKUXEewIZtKjADYSxaG
-M+4272enbJ86JeXUhN8oF9TT+LKgMBgtt9yX5o63Ek6QOKwovH5kemDOVJmwae9p
-tXQEWfCPDFMc7VfSxS4BDBVinRWeMWZs+2AWeWu2CMsjcx7+B+kPbBCzfANanFDD
-CZEQON4pEpfK2XErhOudKEJGCl7psH+9Ex//pqsUS43nVN/4sqydiwbi+wQuUI3P
-BYtvqPnWdjIdf2ayAQQCWliAx9+P03vbef6y
-----END CERTIFICATE-----
--- a/openvpn/ipredator/default.ovpn
+++ b/openvpn/ipredator/default.ovpn
@ -1,32 +0,0 @@
-# VER: 0.25
-client
-dev tun
-proto udp
-remote pw.openvpn.ipredator.se 1194
-remote pw.openvpn.ipredator.me 1194
-remote pw.openvpn.ipredator.es 1194
-resolv-retry infinite
-nobind
-
-auth-user-pass /config/openvpn-credentials.txt
-ca /etc/openvpn/ipredator/ca.crt
-
-tls-client
-tls-auth /etc/openvpn/ipredator/ta.key
-ns-cert-type server
-remote-cert-tls server
-remote-cert-ku 0x00e0 
-
-cipher AES-256-CBC
-persist-key
-comp-lzo
-tun-mtu 1500
-mssfix 1200
-passtos
-verb 3
-replay-window 512 60
-mute-replay-warnings
-ifconfig-nowarn
-
-# Enable this if your system does support it!
-#tls-version-min 1.2
--- a/openvpn/ipredator/ta.key
+++ b/openvpn/ipredator/ta.key
@ -1,21 +0,0 @@
-#
-# 2048 bit OpenVPN static key
-#
-----BEGIN OpenVPN Static key V1-----
-03f7b2056b9dc67aa79c59852cb6b35a
-a3a15c0ca685ca76890bbb169e298837
-2bdc904116f5b66d8f7b3ea6a5ff05cb
-fc4f4889d702d394710e48164b28094f
-a0e1c7888d471da39918d747ca4bbc2f
-285f676763b5b8bee9bc08e4b5a69315
-d2ff6b9f4b38e6e2e8bcd05c8ac33c5c
-56c4c44dbca35041b67e2374788f8977
-7ad4ab8e06cd59e7164200dfbadb942a
-351a4171ab212c23bee1920120f81205
-efabaa5e34619f13adbe58b6c83536d3
-0d34e6466feabdd0e63b39ad9bb1116b
-37fafb95759ab9a15572842f70e7cba9
-69700972a01b21229eba487745c091dd
-5cd6d77bdc7a54a756ffe440789fd39e
-97aa9abe2749732b7262f82e4097bee3
-----END OpenVPN Static key V1-----
--- a/openvpn/ipvanish/ca.ipvanish.com.crt
+++ b/openvpn/ipvanish/ca.ipvanish.com.crt
@ -1,28 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIErTCCA5WgAwIBAgIJAMYKzSS8uPKDMA0GCSqGSIb3DQEBDQUAMIGVMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCRkwxFDASBgNVBAcTC1dpbnRlciBQYXJrMREwDwYD
-VQQKEwhJUFZhbmlzaDEVMBMGA1UECxMMSVBWYW5pc2ggVlBOMRQwEgYDVQQDEwtJ
-UFZhbmlzaCBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBpcHZhbmlzaC5jb20w
-HhcNMTIwMTExMTkzMjIwWhcNMjgxMTAyMTkzMjIwWjCBlTELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkZMMRQwEgYDVQQHEwtXaW50ZXIgUGFyazERMA8GA1UEChMISVBW
-YW5pc2gxFTATBgNVBAsTDElQVmFuaXNoIFZQTjEUMBIGA1UEAxMLSVBWYW5pc2gg
-Q0ExIzAhBgkqhkiG9w0BCQEWFHN1cHBvcnRAaXB2YW5pc2guY29tMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt9DBWNr/IKOuY3TmDP5x7vYZR0DGxLbX
-U8TyAzBbjUtFFMbhxlHiXVQrZHmgzih94x7BgXM7tWpmMKYVb+gNaqMdWE680Qm3
-nOwmhy/dulXDkEHAwD05i/iTx4ZaUdtV2vsKBxRg1vdC4AEiwD7bqV4HOi13xcG9
-71aQ55Mj1KeCdA0aNvpat1LWx2jjWxsfI8s2Lv5Fkoi1HO1+vTnnaEsJZrBgAkLX
-pItqP29Lik3/OBIvkBIxlKrhiVPixE5qNiD+eSPirsmROvsyIonoJtuY4Dw5K6pc
-NlKyYiwo1IOFYU3YxffwFJk+bSW4WVBhsdf5dGxq/uOHmuz5gdwxCwIDAQABo4H9
-MIH6MAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFEv9FCWJHefBcIPX9p8RHCVOGe6u
-MIHKBgNVHSMEgcIwgb+AFEv9FCWJHefBcIPX9p8RHCVOGe6uoYGbpIGYMIGVMQsw
-CQYDVQQGEwJVUzELMAkGA1UECBMCRkwxFDASBgNVBAcTC1dpbnRlciBQYXJrMREw
-DwYDVQQKEwhJUFZhbmlzaDEVMBMGA1UECxMMSVBWYW5pc2ggVlBOMRQwEgYDVQQD
-EwtJUFZhbmlzaCBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBpcHZhbmlzaC5j
-b22CCQDGCs0kvLjygzANBgkqhkiG9w0BAQ0FAAOCAQEAI2dkh/43ksV2fdYpVGhY
-aFZPVqCJoToCez0IvOmLeLGzow+EOSrY508oyjYeNP4VJEjApqo0NrMbKl8g/8bp
-LBcotOCF1c1HZ+y9v7648uumh01SMjsbBeHOuQcLb+7gX6c0pEmxWv8qj5JiW3/1
-L1bktnjW5Yp5oFkFSMXjOnIoYKHyKLjN2jtwH6XowUNYpg4qVtKU0CXPdOznWcd9
-/zSfa393HwJPeeVLbKYaFMC4IEbIUmKYtWyoJ9pJ58smU3pWsHZUg9Zc0LZZNjkN
-lBdQSLmUHAJ33Bd7pJS0JQeiWviC+4UTmzEWRKa7pDGnYRYNu2cUo0/voStphv8E
-VA==
-----END CERTIFICATE-----
--- a/openvpn/ipvanish/configure-openvpn.sh
+++ b/openvpn/ipvanish/configure-openvpn.sh
@ -0,0 +1,27 @@
+#! /bin/bash
+
+set -e
+
+baseURL="https://www.ipvanish.com/software/configs"
+CONFIG_BUNDLE="configs.zip"
+
+if [ -z "$VPN_PROVIDER_HOME" ]; then
+    echo "ERROR: Need to have VPN_PROVIDER_HOME set to call this script" && exit 1
+fi
+
+# Delete all files for this provider, except scripts
+find "$VPN_PROVIDER_HOME" -type f ! -name "*.sh" -delete
+
+# Download and extract wanted bundle into temporary file
+tmp_file=$(mktemp)
+echo "Downloading OpenVPN config bundle $CONFIG_BUNDLE into temporary file $tmp_file"
+curl -sSL "${baseURL}/${CONFIG_BUNDLE}" -o "$tmp_file"
+
+echo "Extract OpenVPN config bundle into $VPN_PROVIDER_HOME"
+unzip -qjo "$tmp_file" -d "$VPN_PROVIDER_HOME"
+
+echo "Modify configs for this container"
+find "$VPN_PROVIDER_HOME" -type f -name "*.ovpn" -print0 | xargs -n 1 -r0 /etc/openvpn/modify-openvpn-config.sh
+
+# Select a random server as default.ovpn
+ln -sf "$(find "$VPN_PROVIDER_HOME" -name "*.ovpn" | shuf -n 1)" "$VPN_PROVIDER_HOME"/default.ovpn
--- a/openvpn/ipvanish/default.ovpn
+++ b/openvpn/ipvanish/default.ovpn
@ -1 +0,0 @@
-ipvanish-NL-Amsterdam-ams-a03.ovpn
--- a/openvpn/ipvanish/ipvanish-AE-Dubai-dxb-c01.ovpn
+++ b/openvpn/ipvanish/ipvanish-AE-Dubai-dxb-c01.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote dxb-c01.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name dxb-c01.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AE-Dubai-dxb-c02.ovpn
+++ b/openvpn/ipvanish/ipvanish-AE-Dubai-dxb-c02.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote dxb-c02.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name dxb-c02.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AL-Tirana-tia-c02.ovpn
+++ b/openvpn/ipvanish/ipvanish-AL-Tirana-tia-c02.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote tia-c02.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name tia-c02.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AL-Tirana-tia-c03.ovpn
+++ b/openvpn/ipvanish/ipvanish-AL-Tirana-tia-c03.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote tia-c03.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name tia-c03.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AL-Tirana-tia-c04.ovpn
+++ b/openvpn/ipvanish/ipvanish-AL-Tirana-tia-c04.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote tia-c04.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name tia-c04.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AL-Tirana-tia-c05.ovpn
+++ b/openvpn/ipvanish/ipvanish-AL-Tirana-tia-c05.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote tia-c05.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name tia-c05.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AR-Buenos-Aires-eze-c01.ovpn
+++ b/openvpn/ipvanish/ipvanish-AR-Buenos-Aires-eze-c01.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote eze-c01.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name eze-c01.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AR-Buenos-Aires-eze-c02.ovpn
+++ b/openvpn/ipvanish/ipvanish-AR-Buenos-Aires-eze-c02.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote eze-c02.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name eze-c02.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AR-Buenos-Aires-eze-c03.ovpn
+++ b/openvpn/ipvanish/ipvanish-AR-Buenos-Aires-eze-c03.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote eze-c03.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name eze-c03.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AR-Buenos-Aires-eze-c04.ovpn
+++ b/openvpn/ipvanish/ipvanish-AR-Buenos-Aires-eze-c04.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote eze-c04.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name eze-c04.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c04.ovpn
+++ b/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c04.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote vie-c04.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name vie-c04.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c05.ovpn
+++ b/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c05.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote vie-c05.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name vie-c05.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c06.ovpn
+++ b/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c06.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote vie-c06.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name vie-c06.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c07.ovpn
+++ b/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c07.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote vie-c07.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name vie-c07.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c08.ovpn
+++ b/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c08.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote vie-c08.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name vie-c08.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c09.ovpn
+++ b/openvpn/ipvanish/ipvanish-AT-Vienna-vie-c09.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote vie-c09.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name vie-c09.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c01.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c01.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote bne-c01.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name bne-c01.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c02.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c02.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote bne-c02.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name bne-c02.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c03.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c03.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote bne-c03.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name bne-c03.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c04.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c04.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote bne-c04.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name bne-c04.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c05.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c05.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote bne-c05.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name bne-c05.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c06.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Brisbane-bne-c06.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote bne-c06.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name bne-c06.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a01.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a01.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote mel-a01.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name mel-a01.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a02.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a02.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote mel-a02.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name mel-a02.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a03.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a03.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote mel-a03.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name mel-a03.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a04.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a04.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote mel-a04.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name mel-a04.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a05.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a05.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote mel-a05.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name mel-a05.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a06.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a06.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote mel-a06.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name mel-a06.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a07.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Melbourne-mel-a07.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote mel-a07.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name mel-a07.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Perth-per-c01.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Perth-per-c01.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote per-c01.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name per-c01.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Perth-per-c02.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Perth-per-c02.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote per-c02.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name per-c02.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Perth-per-c03.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Perth-per-c03.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote per-c03.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name per-c03.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Perth-per-c04.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Perth-per-c04.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote per-c04.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name per-c04.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Perth-per-c05.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Perth-per-c05.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote per-c05.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name per-c05.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Perth-per-c06.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Perth-per-c06.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote per-c06.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name per-c06.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a01.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a01.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a01.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a01.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a02.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a02.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a02.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a02.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a03.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a03.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a03.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a03.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a04.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a04.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a04.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a04.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a05.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a05.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a05.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a05.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a06.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a06.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a06.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a06.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a07.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a07.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a07.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a07.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a08.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a08.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a08.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a08.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a09.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a09.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a09.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a09.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a10.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a10.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a10.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a10.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a11.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a11.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a11.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a11.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a12.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a12.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a12.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a12.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a13.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a13.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a13.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a13.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a14.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a14.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a14.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a14.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a15.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a15.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a15.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a15.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a16.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a16.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a16.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a16.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a17.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a17.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a17.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a17.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a18.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a18.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a18.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a18.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a19.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a19.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a19.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a19.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a20.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a20.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a20.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a20.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a21.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a21.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a21.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a21.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a22.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a22.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a22.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a22.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a23.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a23.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a23.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a23.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a24.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a24.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a24.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a24.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a25.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a25.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a25.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a25.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a26.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a26.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a26.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a26.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a27.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a27.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a27.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a27.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a28.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a28.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a28.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a28.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a29.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a29.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a29.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a29.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a30.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a30.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a30.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a30.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a31.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a31.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a31.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a31.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a32.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a32.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a32.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a32.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a33.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a33.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a33.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a33.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a34.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a34.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a34.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a34.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a35.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a35.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a35.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a35.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a36.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a36.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a36.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a36.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a37.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a37.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a37.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a37.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a38.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a38.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a38.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a38.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a39.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a39.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a39.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a39.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a40.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a40.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a40.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a40.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a41.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a41.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a41.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a41.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a42.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a42.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a42.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a42.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a43.ovpn
+++ b/openvpn/ipvanish/ipvanish-AU-Sydney-syd-a43.ovpn
@ -1,18 +0,0 @@
-client
-dev tun
-proto udp
-remote syd-a43.ipvanish.com 443
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-persist-remote-ip
-ca /etc/openvpn/ipvanish/ca.ipvanish.com.crt
-verify-x509-name syd-a43.ipvanish.com name
-auth-user-pass /config/openvpn-credentials.txt
-comp-lzo
-verb 3
-auth SHA256
-cipher AES-256-CBC
-keysize 256
-tls-cipher TLS-DHE-RSA-WITH-AES-256-CBC-SHA:TLS-DHE-DSS-WITH-AES-256-CBC-SHA:TLS-RSA-WITH-AES-256-CBC-SHA
--- a/Show More
+++ b/Show More