58 changed files with 866 additions and 2480 deletions
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@ -1,37 +0,0 @@
 ---
 when:
  event:
    - push
  branch:
    - main
 matrix:
  TARGET:
    - openvpn_xor
    - openvpn
 steps:
  build-${TARGET}:
    name: Build ${TARGET}
    image: zot.badhouseplants.net/badhouseplants/badhouseplants-builder:latest
    secrets:
      - registry_token
    environment:
      CONTAINER_REGISTRY: zot.badhouseplants.net
    privileged: true
    depends_on: []
    backend_options:
      kubernetes:
        resources:
          requests:
            memory: 1024Mi
            cpu: 300m
          limits:
            memory: 1024Mi
        securityContext:
          privileged: true
        nodeSelector:
          kubernetes.io/arch: "amd64"
    commands:
      - source ./env/${TARGET}.env
      - ./scripts/$SCRIPT
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,35 +0,0 @@
 # Contributing to docker-openvpn
 Community contributions are welcome and help move the project along.  Please review this document before sending any pull requests.
 Thanks!
 ## Bug Fixes
 All bug fixes are welcome.  Please try to add a test if the bug is something that should have been fixed already.  Oops.
 ## Feature Additions
 New features are welcome provided that the feature has a general audience and is reasonably simple.  The goal of the repository is to support a wide audience and be simple enough.
 Please add new documentation in the `docs` folder for any new features.  Pull requests for missing documentation is welcome as well.  Keep the `README.md` focused on the most popular use case, details belong in the docs directory.
 If you have a special feature, you're likely to try but it will likely be rejected if not too many people seem interested.
 ## Tests
 In an effort to not repeat bugs (and break less popular features), unit tests are run on [Travis CI](https://travis-ci.org/kylemanna/docker-openvpn).  The goal of the tests are to be simple and to be placed in the `test/tests` directory where it will be automatically run.  Review existing tests for an example.
 ## Style
 The style of the repo follows that of the Linux kernel, in particular:
 * Pull requests should be rebased to small atomic commits so that the merged history is more coherent
 * The subject of the commit should be in the form "`<subsystem>: <subject>`"
 * More details in the body
 * Match surrounding coding style (line wrapping, spaces, etc)
 More details in the [SubmittingPatches](https://www.kernel.org/doc/html/latest/process/submitting-patches.html) document included with the Linux kernel.  In particular the following sections:
 * `2) Describe your changes`
 * `3) Separate your changes`
--- a/31
+++ b/31
@ -0,0 +1,31 @@
 # Original credit: https://github.com/jpetazzo/dockvpn
 # Leaner build then Ubunutu
 FROM debian:jessie
 MAINTAINER Kyle Manna <kyle@kylemanna.com>
 RUN apt-get update && \
    apt-get install -y openvpn iptables git-core && \
    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 # Update checkout to use tags when v3.0 is finally released
 RUN git clone --depth 1 --branch v3.0.0-rc2 https://github.com/OpenVPN/easy-rsa.git /usr/local/share/easy-rsa && \
    ln -s /usr/local/share/easy-rsa/easyrsa3/easyrsa /usr/local/bin
 # Needed by scripts
 ENV OPENVPN /etc/openvpn
 ENV EASYRSA /usr/local/share/easy-rsa/easyrsa3
 ENV EASYRSA_PKI $OPENVPN/pki
 ENV EASYRSA_VARS_FILE $OPENVPN/vars
 VOLUME ["/etc/openvpn"]
 # Internally uses port 1194, remap using docker
 EXPOSE 1194/udp
 WORKDIR /etc/openvpn
 CMD ["ovpn_run"]
 ADD ./bin /usr/local/bin
 RUN chmod a+x /usr/local/bin/*
--- a/674
+++ b/674
@ -1,21 +1,661 @@
-The MIT License (MIT)
+                    GNU AFFERO GENERAL PUBLIC LICENSE
                       Version 3, 19 November 2007
-Copyright (c) 2014 Kyle Manna
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
-Permission is hereby granted, free of charge, to any person obtaining a copy
+                            Preamble
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
+  The GNU Affero General Public License is a free, copyleft license for
-copies or substantial portions of the Software.
+software and other kinds of works, specifically designed to ensure
 cooperation with the community in the case of network server software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  The licenses for most software and other practical works are designed
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+to take away your freedom to share and change the works.  By contrast,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+our General Public Licenses are intended to guarantee your freedom to
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+share and change all versions of a program--to make sure it remains free
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+software for all its users.
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
-SOFTWARE.
+  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  Developers that use our General Public Licenses protect your rights
 with two steps: (1) assert copyright on the software, and (2) offer
 you this License which gives you legal permission to copy, distribute
 and/or modify the software.
  A secondary benefit of defending all users' freedom is that
 improvements made in alternate versions of the program, if they
 receive widespread use, become available for other developers to
 incorporate.  Many developers of free software are heartened and
 encouraged by the resulting cooperation.  However, in the case of
 software used on network servers, this result may fail to come about.
 The GNU General Public License permits making a modified version and
 letting the public access it on a server without ever releasing its
 source code to the public.
  The GNU Affero General Public License is designed specifically to
 ensure that, in such cases, the modified source code becomes available
 to the community.  It requires the operator of a network server to
 provide the source code of the modified version running there to the
 users of that server.  Therefore, public use of a modified version, on
 a publicly accessible server, gives the public access to the source
 code of the modified version.
  An older license, called the Affero General Public License and
 published by Affero, was designed to accomplish similar goals.  This is
 a different license, not a version of the Affero GPL, but Affero has
 released a new version of the Affero GPL which permits relicensing under
 this license.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU Affero General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Remote Network Interaction; Use with the GNU General Public License.
  Notwithstanding any other provision of this License, if you modify the
 Program, your modified version must prominently offer all users
 interacting with it remotely through a computer network (if your version
 supports such interaction) an opportunity to receive the Corresponding
 Source of your version by providing access to the Corresponding Source
 from a network server at no charge, through some standard or customary
 means of facilitating copying of software.  This Corresponding Source
 shall include the Corresponding Source for any work covered by version 3
 of the GNU General Public License that is incorporated pursuant to the
 following paragraph.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the work with which it is combined will remain governed by version
 3 of the GNU General Public License.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU Affero General Public License from time to time.  Such new versions
 will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU Affero General Public License for more details.
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If your software can interact with users remotely through a computer
 network, you should also make sure that it provides a way for users to
 get its source.  For example, if your program is a web application, its
 interface could display a "Source" link that leads users to an archive
 of the code.  There are many ways you could offer source, and different
 solutions will be better for different programs; see section 13 for the
 specific requirements.
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <http://www.gnu.org/licenses/>.
--- a/Makefile.in
+++ b/Makefile.in
--- a/README.md
+++ b/README.md
@ -1,88 +1,51 @@
 # OpenVPN for Docker
-OpenVPN server in a Docker container complete with an EasyRSA PKI CA, with support for the [Tunnelblick obfuscation patch](https://tunnelblick.net/cOpenvpn_xorpatch.html). Based on [kylemanna's docker-openvpn image](https://github.com/kylemanna/docker-openvpn).
+OpenVPN server in a Docker container complete with an EasyRSA PKI CA.
-#### Upstream Links
+Extensively tested on [Digital Ocean $5/mo node](http://bit.ly/1C7cKr3) and has
 a corresponding [Digital Ocean Community Tutorial](http://bit.ly/1AGUZkq).
-* Docker Registry @ [lawtancool/docker-openvpn-xor](https://hub.docker.com/r/lawtancool/docker-openvpn-xor)
+Upstream links:
 * GitHub @ [lawtancool/docker-openvpn-xor](https://github.com/lawtancool/docker-openvpn-xor)
-#### Clients with support for the Tunnelblick obfuscation patch
+* Docker Registry @ [kylemanna/openvpn](https://registry.hub.docker.com/u/kylemanna/openvpn)
-* Windows: https://github.com/lawtancool/openvpn-windows-xor
+* GitHub @ [kylemanna/docker-openvpn](https://github.com/kylemanna/docker-openvpn)
 * Android: https://github.com/lawtancool/ics-openvpn-xor
 * macOS: https://tunnelblick.net/
 ## Quick Start
-* Pick a name for the `$OVPN_DATA` data volume container. It's recommended to
+* Create the `$OVPN_DATA` volume container, i.e. `OVPN_DATA="ovpn-data"`
  use the `ovpn-data-` prefix to operate seamlessly with the reference systemd
  service.  Users are encourage to replace `example` with a descriptive name of
  their choosing.
-      OVPN_DATA="ovpn-data-example"
+        docker run --name $OVPN_DATA -v /etc/openvpn busybox
-* Initialize the `$OVPN_DATA` container that will hold the configuration files
+* Initialize the `$OVPN_DATA` container that will hold the configuration files and certificates
  and certificates.  The container will prompt for a passphrase to protect the
  private key used by the newly generated certificate authority.
-      docker volume create --name $OVPN_DATA
+        docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
-      docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm lawtancool/docker-openvpn-xor ovpn_genconfig -u udp://VPN.SERVERNAME.COM
+        docker run --volumes-from $OVPN_DATA --rm -it kylemanna/openvpn ovpn_initpki
      docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm -it lawtancool/docker-openvpn-xor ovpn_initpki
 * Start OpenVPN server process
-      docker run -v $OVPN_DATA:/etc/openvpn -d -p 1194:1194/udp --cap-add=NET_ADMIN lawtancool/docker-openvpn-xor
+    - On Docker [version 1.2](http://blog.docker.com/2014/08/announcing-docker-1-2-0/) and newer
            docker run --volumes-from $OVPN_DATA -d -p 1194:1194/udp --cap-add=NET_ADMIN kylemanna/openvpn
    - On Docker older than version 1.2
            docker run --volumes-from $OVPN_DATA -d -p 1194:1194/udp --privileged kylemanna/openvpn
 * Generate a client certificate without a passphrase
-      docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm -it lawtancool/docker-openvpn-xor ovpn_genclientcert CLIENTNAME nopass
+        docker run --volumes-from $OVPN_DATA --rm -it kylemanna/openvpn easyrsa build-client-full CLIENTNAME nopass
 * Retrieve the client configuration with embedded certificates
-      docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm lawtancool/docker-openvpn-xor ovpn_getclient CLIENTNAME > CLIENTNAME.ovpn
+        docker run --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_getclient CLIENTNAME > CLIENTNAME.ovpn
 ## Next Steps
 ### More Reading
 Miscellaneous write-ups for advanced configurations are available in the
 [docs](docs) folder.
 ### Systemd Init Scripts
 A `systemd` init script is available to manage the OpenVPN container.  It will
 start the container on system boot, restart the container if it exits
 unexpectedly, and pull updates from Docker Hub to keep itself up to date.
 Please refer to the [systemd documentation](docs/systemd.md) to learn more.
 ### Docker Compose
 If you prefer to use `docker-compose` please refer to the [documentation](docs/docker-compose.md).
 ## Debugging Tips
 * Create an environment variable with the name DEBUG and value of 1 to enable debug output (using "docker -e").
-        docker run -v $OVPN_DATA:/etc/openvpn -p 1194:1194/udp --privileged -e DEBUG=1 lawtancool/docker-openvpn-xor
+        for example - docker run --volumes-from $OVPN_DATA -d -p 1194:1194/udp --privileged -e DEBUG=1 kylemanna/openvpn
 * Test using a client that has openvpn installed correctly
        $ openvpn --config CLIENTNAME.ovpn
 * Run through a barrage of debugging checks on the client if things don't just work
        $ ping 8.8.8.8    # checks connectivity without touching name resolution
        $ dig google.com  # won't use the search directives in resolv.conf
        $ nslookup google.com # will use search
 * Consider setting up a [systemd service](/docs/systemd.md) for automatic
  start-up at boot time and restart in the event the OpenVPN daemon or Docker
  crashes.
 ## How Does It Work?
-Initialize the volume container using the `lawtancool/docker-openvpn-xor` image with the
+Initialize the volume container using the `kylemanna/openvpn` image with the
 included scripts to automatically generate:
 - Diffie-Hellman parameters
@ -95,18 +58,17 @@ The OpenVPN server is started with the default run cmd of `ovpn_run`
 The configuration is located in `/etc/openvpn`, and the Dockerfile
 declares that directory as a volume. It means that you can start another
-container with the `-v` argument, and access the configuration.
+container with the `--volumes-from` flag, and access the configuration.
 The volume also holds the PKI keys and certs so that it could be backed up.
-To generate a client certificate, `lawtancool/docker-openvpn-xor` uses EasyRSA via the
+To generate a client certificate, `kylemanna/openvpn` uses EasyRSA via the
 `easyrsa` command in the container's path.  The `EASYRSA_*` environmental
-variables place the PKI CA under `/etc/openvpn/pki`.
+variables place the PKI CA under `/etc/opevpn/pki`.
-Conveniently, `lawtancool/docker-openvpn-xor` comes with a script called `ovpn_getclient`,
+Conveniently, `kylemanna/openvpn` comes with a script called `ovpn_getclient`,
 which dumps an inline OpenVPN client configuration file.  This single file can
 then be given to a client for access to the VPN.
 To enable Two Factor Authentication for clients (a.k.a. OTP) see [this document](/docs/otp.md).
 ## OpenVPN Details
@ -143,13 +105,13 @@ packets, etc).
  simplicity.  It's highly recommended to secure the CA key with some
  passphrase to protect against a filesystem compromise.  A more secure system
  would put the EasyRSA PKI CA on an offline system (can use the same Docker
-  image and the script [`ovpn_copy_server_files`](/docs/paranoid.md) to accomplish this).
+  image and the script [`ovpn_copy_server_files`](/docs/clients.md) to accomplish this).
 * It would be impossible for an adversary to sign bad or forged certificates
  without first cracking the key's passphase should the adversary have root
  access to the filesystem.
 * The EasyRSA `build-client-full` command will generate and leave keys on the
  server, again possible to compromise and steal the keys.  The keys generated
-  need to be signed by the CA which the user hopefully configured with a passphrase
+  need to signed by the CA which the user hopefully configured with a passphrase
  as described above.
 * Assuming the rest of the Docker container's filesystem is secure, TLS + PKI
  security should prevent any malicious host from using the VPN.
@ -168,11 +130,11 @@ OpenVPN with latest OpenSSL on Ubuntu 12.04 LTS).
 ### It Doesn't Stomp All Over the Server's Filesystem
 Everything for the Docker container is contained in two images: the ephemeral
-run time image (lawtancool/docker-openvpn-xor) and the `$OVPN_DATA` data volume. To remove
+run time image (kylemanna/openvpn) and the data image (using busybox as a
-it, remove the corresponding containers, `$OVPN_DATA` data volume and Docker
+base).  To remove it, remove the two Docker images and corresponding containers
-image and it's completely removed.  This also makes it easier to run multiple
+and it's all gone.  This also makes it easier to run multiple servers since
-servers since each lives in the bubble of the container (of course multiple IPs
+each lives in the bubble of the container (of course multiple IPs or separate
-or separate ports are needed to communicate with the world).
+ports are needed to communicate with the world).
 ### Some (arguable) Security Benefits
@ -190,6 +152,12 @@ of a guarantee in the future.
  volume for re-use across containers
 * Addition of tls-auth for HMAC security
-## Differences from kylemanna/openvpn
+## Tested On
-* Based on Ubuntu instead of Alpine
+
-* Compiles OpenVPN 2.5.0 from source, applying the [Tunnelblick obfuscation patches](https://github.com/Tunnelblick/Tunnelblick/tree/master/third_party/sources/openvpn/openvpn-2.5.0/patches)
+* Docker hosts:
  * server a [Digital Ocean](https://www.digitalocean.com/?refcode=d19f7fe88c94) Droplet with 512 MB RAM running Ubuntu 14.04
 * Clients
  * Android App OpenVPN Connect 1.1.14 (built 56)
     * OpenVPN core 3.0 android armv7a thumb2 32-bit
  * OS X Mavericks with Tunnelblick 3.4beta26 (build 3828) using openvpn-2.3.4
  * ArchLinux OpenVPN pkg 2.3.4-1
--- a/bin/ovpn_copy_server_files
+++ b/bin/ovpn_copy_server_files
@ -1,9 +1,7 @@
 #!/bin/bash
-## @licence MIT <http://opensource.org/licenses/MIT>
+## @licence AGPLv3 <https://www.gnu.org/licenses/agpl-3.0.html>
 ## @author Copyright (C) 2015 Robin Schneider <ypid@riseup.net>
 set -e
 if [ -z "$OPENVPN" ]; then
    export OPENVPN="$PWD"
 fi
@ -12,36 +10,25 @@ if ! source "$OPENVPN/ovpn_env.sh"; then
    exit 1
 fi
-TARGET="$OPENVPN/server"
+TARGET="/tmp/openvpn_${OVPN_CN}"
 if [ -n "$1" ]; then
    TARGET="$1"
-fi
+else
-mkdir -p "${TARGET}"
+    TARGET="$OPENVPN/server"
 ## Ensure that no other keys then the one for the server is present.
 rm -rf "$TARGET/pki/private" "$TARGET/pki/issued"
 FILES=(
    "openvpn.conf"
    "ovpn_env.sh"
    "pki/private/${OVPN_CN}.key"
    "pki/issued/${OVPN_CN}.crt"
    "pki/dh.pem"
    "pki/ta.key"
    "pki/ca.crt"
    "ccd"
 )
 if [ -f "${OPENVPN}/pki/crl.pem" ]; then
    FILES+=("pki/crl.pem")
 fi
-# Ensure the ccd directory exists, even if empty
+rsync --recursive --verbose --prune-empty-dirs \
-mkdir -p "ccd"
+    --exclude="clients" \
-
+    --exclude="server" \
-# rsync isn't available to keep size down
+    --include "*/" \
-# cp --parents isn't in busybox version
+    --include "/pki/private/${OVPN_CN}.key" \
-# hack the directory structure with tar
+    --include "/pki/ca.crt" \
-tar cf - -C "${OPENVPN}" "${FILES[@]}" | tar xvf - -C "${TARGET}"
+    --include "/pki/issued/${OVPN_CN}.crt" \
    --include "/pki/dh.pem" \
    --include "ta.key" \
    --include "/openvpn.conf" \
    --include "/ovpn_env.sh" \
    --exclude="*" \
    "$OPENVPN/" "$TARGET"
 echo "Created the openvpn configuration for the server: $TARGET"
--- a/bin/ovpn_genclientcert
+++ b/bin/ovpn_genclientcert
@ -1,18 +0,0 @@
 #!/bin/bash
 #
 # Generate a client certificate with EasyRSA
 #
 if [ "$DEBUG" == "1" ]; then
  set -x
 fi
 CLIENTNAME=$1
 PASSWORD=$2
 set -e
 source "$OPENVPN/ovpn_env.sh"
 /usr/share/easy-rsa/easyrsa build-client-full $CLIENTNAME $PASSWORD
--- a/bin/ovpn_genconfig
+++ b/bin/ovpn_genconfig
@ -4,54 +4,6 @@
 # Generate OpenVPN configs
 #
 TMP_PUSH_CONFIGFILE=$(mktemp -t vpn_push.XXXXXXX)
 TMP_ROUTE_CONFIGFILE=$(mktemp -t vpn_route.XXXXXXX)
 TMP_EXTRA_CONFIGFILE=$(mktemp -t vpn_extra.XXXXXXX)
 #Traceback on Error and Exit come from https://docwhat.org/tracebacks-in-bash/
 set -eu
 _showed_traceback=f
 traceback() {
 	# Hide the traceback() call.
 	local -i start=$(( ${1:-0} + 1 ))
 	local -i end=${#BASH_SOURCE[@]}
 	local -i i=0
 	local -i j=0
 	echo "Traceback (last called is first):" 1>&2
 	for ((i=${start}; i < ${end}; i++)); do
 		j=$(( $i - 1 ))
 		local function="${FUNCNAME[$i]}"
 		local file="${BASH_SOURCE[$i]}"
 		local line="${BASH_LINENO[$j]}"
 		echo "     ${function}() in ${file}:${line}" 1>&2
 	done
 }
 on_error() {
  local _ec="$?"
  local _cmd="${BASH_COMMAND:-unknown}"
  traceback 1
  _showed_traceback=t
  echo "The command ${_cmd} exited with exit code ${_ec}." 1>&2
 }
 trap on_error ERR
 on_exit() {
  echo "Cleaning up before Exit ..."
  rm -f $TMP_PUSH_CONFIGFILE
  rm -f $TMP_ROUTE_CONFIGFILE
  rm -f $TMP_EXTRA_CONFIGFILE
  local _ec="$?"
  if [[ $_ec != 0 && "${_showed_traceback}" != t ]]; then
    traceback 1
  fi
 }
 trap on_exit EXIT
 # Convert 1.2.3.4/24 -> 255.255.255.0
 cidr2mask()
 {
@ -82,152 +34,57 @@ getroute() {
 usage() {
    echo "usage: $0 [-d]"
    echo "                  -u SERVER_PUBLIC_URL"
    echo "                 [-e EXTRA_SERVER_CONFIG ]"
    echo "                 [-E EXTRA_CLIENT_CONFIG ]"
    echo "                 [-f FRAGMENT ]"
    echo "                 [-n DNS_SERVER ...]"
    echo "                 [-p PUSH ...]"
    echo "                 [-r ROUTE ...]"
    echo "                 [-s SERVER_SUBNET]"
    echo "                 [-r ROUTE ...]"
    echo "                 [-p PUSH ...]"
    echo
    echo "optional arguments:"
-    echo " -2    Enable two factor authentication using Google Authenticator."
+    echo " -d    Disable NAT routing and default route"
    echo " -a    Authenticate  packets with HMAC using the given message digest algorithm (auth)."
    echo " -b    Disable 'push block-outside-dns'"
    echo " -c    Enable client-to-client option"
-    echo " -C    A list of allowable TLS ciphers delimited by a colon (cipher)."
+    echo " -D    Disable built in external dns (google dns)"
    echo " -d    Disable default route"
    echo " -D    Do not push dns servers"
    echo " -k    Set keepalive. Default: '10 60'"
    echo " -m    Set client MTU"
    echo " -N    Configure NAT to access external server network"
-    echo " -t    Use TAP device (instead of TUN device)"
+    echo " -m    Set client MTU"
    echo " -T    Encrypt packets with the given cipher algorithm instead of the default one (tls-cipher)."
    echo " -z    Enable comp-lzo compression."
 }
-process_route_config() {
+if [ "$DEBUG" == "1" ]; then
  local ovpn_route_config=''
  ovpn_route_config="$1"
  # If user passed "0" skip this, assume no extra routes
  [[ "$ovpn_route_config" == "0" ]] && break;
  echo "Processing Route Config: '${ovpn_route_config}'"
  [[ -n "$ovpn_route_config" ]] && echo "route $(getroute $ovpn_route_config)" >> "$TMP_ROUTE_CONFIGFILE"
 }
 process_push_config() {
  local ovpn_push_config=''
  ovpn_push_config="$1"
  echo "Processing PUSH Config: '${ovpn_push_config}'"
  [[ -n "$ovpn_push_config" ]] && echo "push \"$ovpn_push_config\"" >> "$TMP_PUSH_CONFIGFILE"
 }
 process_extra_config() {
  local ovpn_extra_config=''
  ovpn_extra_config="$1"
  echo "Processing Extra Config: '${ovpn_extra_config}'"
  [[ -n "$ovpn_extra_config" ]] && echo "$ovpn_extra_config" >> "$TMP_EXTRA_CONFIGFILE"
 }
 if [ "${DEBUG:-}" == "1" ]; then
  set -x
 fi
 set -e
-if [ -z "${OPENVPN:-}" ]; then
+OVPN_ENV=$OPENVPN/ovpn_env.sh
  export OPENVPN="$PWD"
 fi
 if [ -z "${EASYRSA_PKI:-}" ]; then
    export EASYRSA_PKI="$OPENVPN/pki"
 fi
 OVPN_AUTH=''
 OVPN_CIPHER=''
 OVPN_CLIENT_TO_CLIENT=''
 OVPN_CN=''
 OVPN_COMP_LZO=0
 OVPN_DEFROUTE=1
 OVPN_DEVICE="tun"
 OVPN_DEVICEN=0
 OVPN_DISABLE_PUSH_BLOCK_DNS=0
 OVPN_DNS=1
 OVPN_DNS_SERVERS=()
 OVPN_ENV=${OPENVPN}/ovpn_env.sh
 OVPN_EXTRA_CLIENT_CONFIG=()
 OVPN_EXTRA_SERVER_CONFIG=()
 OVPN_FRAGMENT=''
 OVPN_KEEPALIVE="10 60"
 OVPN_MTU=''
 OVPN_NAT=0
 OVPN_PORT=''
 OVPN_PROTO=''
 OVPN_PUSH=()
 OVPN_ROUTES=()
 OVPN_SERVER=192.168.255.0/24
-OVPN_SERVER_URL=''
+OVPN_DEFROUTE=1
-OVPN_TLS_CIPHER=''
+OVPN_NAT=0
 OVPN_DNS=1
 OVPN_ROUTES=()
 TMP_ROUTES=()
 OVPN_PUSH=()
 TMP_PUSH=()
-# Import existing configuration if present
+# Import defaults if present
 [ -r "$OVPN_ENV" ] && source "$OVPN_ENV"
 # Parse arguments
-while getopts ":a:e:E:C:T:r:s:du:bcp:n:k:DNm:f:tz2" opt; do
+while getopts ":r:s:du:cp:DNm:" opt; do
    case $opt in
        a)
            OVPN_AUTH="$OPTARG"
            ;;
        e)
            mapfile -t TMP_EXTRA_SERVER_CONFIG <<< "$OPTARG"
            for i in "${TMP_EXTRA_SERVER_CONFIG[@]}"; do
              OVPN_EXTRA_SERVER_CONFIG+=("$i")
            done
            ;;
        E)
            mapfile -t TMP_EXTRA_CLIENT_CONFIG <<< "$OPTARG"
            for i in "${TMP_EXTRA_CLIENT_CONFIG[@]}"; do
              OVPN_EXTRA_CLIENT_CONFIG+=("$i")
            done
            ;;
        C)
            OVPN_CIPHER="$OPTARG"
            ;;
        T)
            OVPN_TLS_CIPHER="$OPTARG"
            ;;
        r)
-            mapfile -t TMP_ROUTES <<< "$OPTARG"
+            TMP_ROUTES+=("$OPTARG")
            for i in "${TMP_ROUTES[@]}"; do
              OVPN_ROUTES+=("$i")
            done
            ;;
        s)
-            OVPN_SERVER="$OPTARG"
+            OVPN_SERVER=$OPTARG
            ;;
        d)
            OVPN_DEFROUTE=0
            OVPN_DISABLE_PUSH_BLOCK_DNS=1
            ;;
        u)
-            OVPN_SERVER_URL="$OPTARG"
+            OVPN_SERVER_URL=$OPTARG
            ;;
        b)
            OVPN_DISABLE_PUSH_BLOCK_DNS=1
            ;;
        c)
            OVPN_CLIENT_TO_CLIENT=1
            ;;
        p)
-            mapfile -t TMP_PUSH <<< "$OPTARG"
+            TMP_PUSH+=("$OPTARG")
            for i in "${TMP_PUSH[@]}"; do
              OVPN_PUSH+=("$i")
            done
            ;;
        n)
            mapfile -t TMP_DNS_SERVERS <<< "$OPTARG"
            for i in "${TMP_DNS_SERVERS[@]}"; do
              OVPN_DNS_SERVERS+=("$i")
            done
            ;;
        D)
            OVPN_DNS=0
@ -235,23 +92,8 @@ while getopts ":a:e:E:C:T:r:s:du:bcp:n:k:DNm:f:tz2" opt; do
        N)
            OVPN_NAT=1
            ;;
        k)
            OVPN_KEEPALIVE="$OPTARG"
            ;;
        m)
-            OVPN_MTU="$OPTARG"
+            OVPN_MTU=$OPTARG
            ;;
        t)
            OVPN_DEVICE="tap"
            ;;
        z)
            OVPN_COMP_LZO=1
            ;;
        2)
            OVPN_OTP_AUTH=1
            ;;
        f)
            OVPN_FRAGMENT="$OPTARG"
            ;;
        \?)
            set +x
@ -268,11 +110,14 @@ while getopts ":a:e:E:C:T:r:s:du:bcp:n:k:DNm:f:tz2" opt; do
    esac
 done
-# Create ccd directory for static routes
+# if new routes were not defined with -r, use default
-[ ! -d "${OPENVPN:-}/ccd" ] && mkdir -p ${OPENVPN:-}/ccd
+[ ${#TMP_ROUTES[@]} -gt 0 ] && OVPN_ROUTES=("${TMP_ROUTES[@]}")
 # if new push directives were not defined with -p, use default
 [ ${#TMP_PUSH[@]} -gt 0 ] && OVPN_PUSH=("${TMP_PUSH[@]}")
 # Server name is in the form "udp://vpn.example.com:1194"
-if [[ "${OVPN_SERVER_URL:-}" =~ ^((udp|tcp|udp6|tcp6)://)?([0-9a-zA-Z\.\-]+)(:([0-9]+))?$ ]]; then
+if [[ "$OVPN_SERVER_URL" =~ ^((udp|tcp)://)?([0-9a-zA-Z\.\-]+)(:([0-9]+))?$ ]]; then
    OVPN_PROTO=${BASH_REMATCH[2]};
    OVPN_CN=${BASH_REMATCH[3]};
    OVPN_PORT=${BASH_REMATCH[5]};
@ -283,13 +128,14 @@ else
    exit 1
 fi
-# Apply defaults. If dns servers were not defined with -n, use google nameservers
+# Apply defaults
 set +u
 [ -z "$OVPN_DNS_SERVERS" ] && OVPN_DNS_SERVERS=("8.8.8.8" "8.8.4.4")
 [ -z "$OVPN_PROTO" ] && OVPN_PROTO=udp
 [ -z "$OVPN_PORT" ] && OVPN_PORT=1194
-set -u
+[ ${#OVPN_ROUTES[@]} -eq 0 ] && OVPN_ROUTES=("192.168.254.0/24")
-[ "${#OVPN_ROUTES[@]}" == "0" ] && [ "$OVPN_DEFROUTE" == "1" ] && OVPN_ROUTES+=("192.168.254.0/24")
+
 export OVPN_SERVER OVPN_ROUTES OVPN_DEFROUTE
 export OVPN_SERVER_URL OVPN_ENV OVPN_PROTO OVPN_CN OVPN_PORT
 export OVPN_CLIENT_TO_CLIENT OVPN_PUSH OVPN_NAT OVPN_DNS OVPN_MTU
 # Preserve config
 if [ -f "$OVPN_ENV" ]; then
@ -297,114 +143,64 @@ if [ -f "$OVPN_ENV" ]; then
    echo "Backing up $OVPN_ENV -> $bak_env"
    mv "$OVPN_ENV" "$bak_env"
 fi
 export | grep OVPN_ > "$OVPN_ENV"
-# Save the current OVPN_ vars to the ovpn_env.sh file
+conf=$OPENVPN/openvpn.conf
 (set | grep '^OVPN_') | while read -r var; do
  echo "declare -x $var"  >> "$OVPN_ENV"
 done
 conf=${OPENVPN:-}/openvpn.conf
 if [ -f "$conf" ]; then
    bak=$conf.$(date +%s).bak
    echo "Backing up $conf -> $bak"
    mv "$conf" "$bak"
 fi
 # Echo extra client configurations
 if [ ${#OVPN_EXTRA_CLIENT_CONFIG[@]} -gt 0 ]; then
  for i in "${OVPN_EXTRA_CLIENT_CONFIG[@]}"; do
    echo "Processing Extra Client Config: $i"
  done
 fi
 cat > "$conf" <<EOF
 server $(getroute $OVPN_SERVER)
 verb 3
 #duplicate-cn
 key $EASYRSA_PKI/private/${OVPN_CN}.key
 ca $EASYRSA_PKI/ca.crt
 cert $EASYRSA_PKI/issued/${OVPN_CN}.crt
 dh $EASYRSA_PKI/dh.pem
-tls-crypt $EASYRSA_PKI/ta.key
+tls-auth $EASYRSA_PKI/ta.key
-#key-direction 0
+key-direction 0
-keepalive $OVPN_KEEPALIVE
+keepalive 10 60
 persist-key
 persist-tun
 proto $OVPN_PROTO
 # Rely on Docker to do port mapping, internally always 1194
 port 1194
-dev $OVPN_DEVICE$OVPN_DEVICEN
+dev tun0
 status /tmp/openvpn-status.log
 client-config-dir $OPENVPN/ccd
 user nobody
 group nogroup
 EOF
-if [ "${OVPN_DISABLE_PUSH_BLOCK_DNS}" == "1" ]; then
+[ -n "$OVPN_CLIENT_TO_CLIENT" ] && echo "client-to-client" >> "$conf"
-  echo "Disable default push of 'block-outside-dns'"
+[ "$OVPN_DNS" == "1" ] && echo push "dhcp-option DNS 8.8.4.4" >> "$conf"
-else
+[ "$OVPN_DNS" == "1" ] && echo push "dhcp-option DNS 8.8.8.8" >> "$conf"
-  process_push_config "block-outside-dns"
+# Append Routes
 fi
 [ -n "$OVPN_TLS_CIPHER" ] && echo "tls-cipher $OVPN_TLS_CIPHER" >> "$conf"
 [ -n "$OVPN_CIPHER" ] && echo "cipher $OVPN_CIPHER" >> "$conf"
 [ -n "$OVPN_AUTH" ] && echo "auth $OVPN_AUTH" >> "$conf"
 [ -n "${OVPN_CLIENT_TO_CLIENT:-}" ] && echo "client-to-client" >> "$conf"
 [ "$OVPN_COMP_LZO" == "1" ] && echo "comp-lzo" >> "$conf"
 [ "$OVPN_COMP_LZO" == "0" ] && echo "comp-lzo no" >> "$conf"
 [ -n "${OVPN_FRAGMENT:-}" ] && echo "fragment $OVPN_FRAGMENT" >> "$conf"
 # Append route commands
 if [ ${#OVPN_ROUTES[@]} -gt 0 ]; then
 for i in "${OVPN_ROUTES[@]}"; do
-    process_route_config "$i"
+    # If user passed "0" skip this, assume no extra routes
    [ "$i" = "0" ] && break;
    echo route $(getroute "$i") >> "$conf"
 done
  echo -e "\n### Route Configurations Below" >> "$conf"
  cat $TMP_ROUTE_CONFIGFILE >> "$conf"
 fi
 # Append push commands
-[ "$OVPN_DNS" == "1" ] && for i in "${OVPN_DNS_SERVERS[@]}"; do
+for i in "${OVPN_PUSH[@]}"; do
-  process_push_config "dhcp-option DNS $i"
+    echo push \"$i\" >> "$conf"
 done
 if [ "$OVPN_COMP_LZO" == "0" ]; then
    process_push_config "comp-lzo no"
 fi
 [ ${#OVPN_PUSH[@]} -gt 0 ] && for i in "${OVPN_PUSH[@]}"; do
  process_push_config "$i"
 done
 echo -e "\n### Push Configurations Below" >> "$conf"
 cat $TMP_PUSH_CONFIGFILE >> "$conf"
 # Append optional OTP authentication support
 if [ -n "${OVPN_OTP_AUTH:-}" ]; then
    echo -e "\n\n# Enable OTP+PAM for user authentication" >> "$conf"
    echo "plugin /usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so openvpn" >> "$conf"
    echo "reneg-sec 0" >> "$conf"
 fi
 # Append extra server configurations
 if [ ${#OVPN_EXTRA_SERVER_CONFIG[@]} -gt 0 ]; then
  for i in "${OVPN_EXTRA_SERVER_CONFIG[@]}"; do
    process_extra_config "$i"
  done
  echo -e "\n### Extra Configurations Below" >> "$conf"
  cat $TMP_EXTRA_CONFIGFILE >> "$conf"
 fi
 set +e 
 # Clean-up duplicate configs
-if diff -q "${bak_env:-}" "$OVPN_ENV" 2>/dev/null; then
+if diff -q "$bak_env" "$OVPN_ENV" 2>/dev/null; then
    echo "Removing duplicate back-up: $bak_env"
    rm -fv "$bak_env"
 fi
-if diff -q "${bak:-}" "$conf" 2>/dev/null; then
+if diff -q "$bak" "$conf" 2>/dev/null; then
    echo "Removing duplicate back-up: $bak"
    rm -fv "$bak"
 fi
--- a/bin/ovpn_getclient
+++ b/bin/ovpn_getclient
@ -34,42 +34,37 @@ get_client_config() {
    echo "
 client
 nobind
-dev $OVPN_DEVICE
+dev tun
 remote-cert-tls server
-remote $OVPN_CN $OVPN_PORT $OVPN_PROTO"
+remote $OVPN_CN $OVPN_PORT $OVPN_PROTO
-    if [ "$OVPN_PROTO" == "udp6" ]; then
+"
        echo "remote $OVPN_CN $OVPN_PORT udp"
    fi
    if [ "$OVPN_PROTO" == "tcp6" ]; then
        echo "remote $OVPN_CN $OVPN_PORT tcp"
    fi
    for i in "${OVPN_EXTRA_CLIENT_CONFIG[@]}"; do
      echo "$i"
    done
    if [ "$mode" == "combined" ]; then
        echo "
 <key>
 $(cat $EASYRSA_PKI/private/${cn}.key)
 </key>
 <cert>
-$(openssl x509 -in $EASYRSA_PKI/issued/${cn}.crt)
+$(cat $EASYRSA_PKI/issued/${cn}.crt)
 </cert>
 <ca>
 $(cat $EASYRSA_PKI/ca.crt)
 </ca>
-#key-direction 1
+<dh>
-<tls-crypt>
+$(cat $EASYRSA_PKI/dh.pem)
 </dh>
 <tls-auth>
 $(cat $EASYRSA_PKI/ta.key)
-</tls-crypt>
+</tls-auth>
 key-direction 1
 "
    elif [ "$mode" == "separated" ]; then
        echo "
 key ${cn}.key
 ca ca.crt
 cert ${cn}.crt
-tls-crypt ta.key
+dh dh.pem
-#tls-auth ta.key 1
+tls-auth ta.key 1
 "
    fi
@ -80,31 +75,6 @@ tls-crypt ta.key
    if [ -n "$OVPN_MTU" ]; then
        echo "tun-mtu $OVPN_MTU"
    fi
    if [ -n "$OVPN_TLS_CIPHER" ]; then
        echo "tls-cipher $OVPN_TLS_CIPHER"
    fi
    if [ -n "$OVPN_CIPHER" ]; then
        echo "cipher $OVPN_CIPHER"
    fi
    if [ -n "$OVPN_AUTH" ]; then
        echo "auth $OVPN_AUTH"
    fi
    if [ -n "$OVPN_OTP_AUTH" ]; then
        echo "auth-user-pass"
        echo "auth-nocache"
    fi
    if [ "$OVPN_COMP_LZO" == "1" ]; then
        echo "comp-lzo"
    fi
    if [ -n "$OVPN_OTP_AUTH" ]; then
        echo reneg-sec 0
    fi
 }
 dir="$OPENVPN/clients/$cn"
@ -115,19 +85,19 @@ case "$parm" in
        cp "$EASYRSA_PKI/private/${cn}.key" "$dir/${cn}.key"
        cp "$EASYRSA_PKI/ca.crt" "$dir/ca.crt"
        cp "$EASYRSA_PKI/issued/${cn}.crt" "$dir/${cn}.crt"
        cp "$EASYRSA_PKI/dh.pem" "$dir/dh.pem"
        cp "$EASYRSA_PKI/ta.key" "$dir/ta.key"
        ;;
    "" | "combined")
        get_client_config "combined"
        ;;
    "combined-save")
        mkdir -p "$dir"
        get_client_config "combined" > "$dir/${cn}-combined.ovpn"
        ;;
    *)
-        echo "This script can produce the client configuration in two formats:" >&2
+        echo "This script can produce the client configuration in to formats:" >&2
        echo "    1. combined (default): All needed configuration and cryptographic material is in one file (Use \"combined-save\" to write the configuration file in the same path as the separated parameter does)." >&2
        echo "    2. separated: Separated files." >&2
-        echo "Please specify one of those options as second parameter." >&2
+        echo "Please specific one of those options as second parameter." >&2
        ;;
 esac
--- a/bin/ovpn_getclient_all
+++ b/bin/ovpn_getclient_all
@ -1,5 +1,5 @@
 #!/bin/bash
-## @licence MIT <http://opensource.org/licenses/MIT>
+## @licence AGPLv3 <https://www.gnu.org/licenses/agpl-3.0.html>
 ## @author Copyright (C) 2015 Robin Schneider <ypid@riseup.net>
 if [ -z "$OPENVPN" ]; then
--- a/bin/ovpn_initpki
+++ b/bin/ovpn_initpki
@ -15,10 +15,16 @@ source "$OPENVPN/ovpn_env.sh"
 # Specify "nopass" as arg[2] to make the CA insecure (not recommended!)
 nopass=$1
-/usr/share/easy-rsa/easyrsa init-pki
+# Provides a sufficient warning before erasing pre-existing files
-/usr/share/easy-rsa/easyrsa build-ca $nopass
+easyrsa init-pki
-/usr/share/easy-rsa/easyrsa gen-dh
+
-openvpn --genkey --secret $EASYRSA_PKI/ta.key
+# CA always has a password for protection in event server is compromised. The
 # password is only needed to sign client/server certificates.  No password is
 # needed for normal OpenVPN operation.
 easyrsa build-ca $nopass
 easyrsa gen-dh
 openvpn --genkey --secret $OPENVPN/pki/ta.key
 # Was nice to autoset, but probably a bad idea in practice, users should
 # have to explicitly specify the common name of their server
@ -31,7 +37,4 @@ openvpn --genkey --secret $EASYRSA_PKI/ta.key
 #fi
 # For a server key with a password, manually init; this is autopilot
-/usr/share/easy-rsa/easyrsa build-server-full "$OVPN_CN" nopass
+easyrsa build-server-full "$OVPN_CN" nopass
 # Generate the CRL for client/server certificates revocation.
 /usr/share/easy-rsa/easyrsa gen-crl
--- a/bin/ovpn_listclients
+++ b/bin/ovpn_listclients
@ -1,54 +0,0 @@
 #!/bin/bash
 if [ -z "$OPENVPN" ]; then
    export OPENVPN="$PWD"
 fi
 if ! source "$OPENVPN/ovpn_env.sh"; then
    echo "Could not source $OPENVPN/ovpn_env.sh."
    exit 1
 fi
 if [ -z "$EASYRSA_PKI" ]; then
    export EASYRSA_PKI="$OPENVPN/pki"
 fi
 cd "$EASYRSA_PKI"
 if [ -e crl.pem ]; then
    cat ca.crt crl.pem > cacheck.pem
 else
    cat ca.crt > cacheck.pem
 fi
 echo "name,begin,end,status"
 for name in issued/*.crt; do
    path=$name
    begin=$(openssl x509 -noout -startdate -in $path | awk -F= '{ print $2 }')
    end=$(openssl x509 -noout -enddate -in $path | awk -F= '{ print $2 }')
    name=${name%.crt}
    name=${name#issued/}
    if [ "$name" != "$OVPN_CN" ]; then
        # check for revocation or expiration
        command="openssl verify -crl_check -CAfile cacheck.pem $path"
        result=$($command)
        if [ $(echo "$result" | wc -l) == 1 ] && [ "$(echo "$result" | grep ": OK")" ]; then
            status="VALID"
        else
            result=$(echo "$result" | tail -n 1 | grep error | cut -d" " -f2)
            case $result in
                10)
                    status="EXPIRED"
                    ;;
                23)
                    status="REVOKED"
                    ;;
                *)
                    status="INVALID"
            esac
        fi
        echo "$name,$begin,$end,$status"
    fi
 done
 # Clean
 rm cacheck.pem
--- a/bin/ovpn_otp_user
+++ b/bin/ovpn_otp_user
@ -1,33 +0,0 @@
 #!/bin/bash
 #
 # Generate OpenVPN users via google authenticator
 #
 if ! source "$OPENVPN/ovpn_env.sh"; then
    echo "Could not source $OPENVPN/ovpn_env.sh."
    exit 1
 fi
 if [ "x$OVPN_OTP_AUTH" != "x1" ]; then
    echo "OTP authentication not enabled, please regenerate configuration using -2 flag"
    exit 1
 fi
 if [ -z $1 ]; then
    echo "Usage: ovpn_otp_user USERNAME"
    exit 1
 fi
 # Ensure the otp folder is present
 [ -d /etc/openvpn/otp ] || mkdir -p /etc/openvpn/otp
 # Binary is present in image, save an $user.google_authenticator file in /etc/openvpn/otp
 if [ "$2" == "interactive" ]; then
    # Authenticator will ask for other parameters. User can choose rate limit, token reuse policy and time window policy
    # Always use time base OTP otherwise storage for counters must be configured somewhere in volume
    google-authenticator --time-based --force -l "${1}@${OVPN_CN}" -s /etc/openvpn/otp/${1}.google_authenticator
 else
    google-authenticator --time-based --disallow-reuse --force --rate-limit=3 --rate-time=30 --window-size=3 \
        -l "${1}@${OVPN_CN}" -s /etc/openvpn/otp/${1}.google_authenticator
 fi
--- a/bin/ovpn_revokeclient
+++ b/bin/ovpn_revokeclient
@ -1,62 +0,0 @@
 #!/bin/bash
 #
 # Revoke a client certificate
 #
 if [ "$DEBUG" == "1" ]; then
    set -x
 fi
 set -e
 if [ -z "$OPENVPN" ]; then
    export OPENVPN="$PWD"
 fi
 if ! source "$OPENVPN/ovpn_env.sh"; then
    echo "Could not source $OPENVPN/ovpn_env.sh."
    exit 1
 fi
 if [ -z "$EASYRSA_PKI" ]; then
    export EASYRSA_PKI="$OPENVPN/pki"
 fi
 cn="$1"
 parm="$2"
 if [ ! -f "$EASYRSA_PKI/private/${cn}.key" ]; then
    echo "Unable to find \"${cn}\", please try again or generate the key first" >&2
    exit 1
 fi
 revoke_client_certificate(){
    # Download EasyRSA because Ubuntu doesn't have it as a CLI command
    /usr/share/easy-rsa/easyrsa revoke "$1"
    echo "Generating the Certificate Revocation List :"
    /usr/share/easy-rsa/easyrsa gen-crl
    cp -f "$EASYRSA_PKI/crl.pem" "$OPENVPN/crl.pem"
    chmod 644 "$OPENVPN/crl.pem"
 }
 remove_files(){
    rm -v "$EASYRSA_PKI/issued/${1}.crt"
    rm -v "$EASYRSA_PKI/private/${1}.key"
    rm -v "$EASYRSA_PKI/reqs/${1}.req"
 }
 case "$parm" in
    "remove")
        revoke_client_certificate "$cn"
        remove_files "$cn"
        ;;
    "" | "keep")
        revoke_client_certificate "$cn"
        ;;
    *)
        echo "When revoking a client certificate, this script let you choose if you want to remove the corresponding crt, key and req files." >&2
        echo "Pease note that the removal of those files is required if you want to generate a new client certificate using the revoked certificate's CN." >&2
        echo "    1. keep (default): Keep the files." >&2
        echo "    2. remove: Remove the files." >&2
        echo "Please specify one of those options as second parameter." >&2
        ;;
 esac
--- a/bin/ovpn_run
+++ b/bin/ovpn_run
@ -10,48 +10,6 @@ fi
 set -e
 cd $OPENVPN
 # Build runtime arguments array based on environment
 USER_ARGS=("${@}")
 ARGS=()
 # Checks if ARGS already contains the given value
 function hasArg {
    local element
    for element in "${@:2}"; do
        [ "${element}" == "${1}" ] && return 0
    done
    return 1
 }
 # Adds the given argument if it's not already specified.
 function addArg {
    local arg="${1}"
    [ $# -ge 1 ] && local val="${2}"
    if ! hasArg "${arg}" "${USER_ARGS[@]}"; then
        ARGS+=("${arg}")
        [ $# -ge 1 ] && ARGS+=("${val}")
    fi
 }
 # set up iptables rules and routing
 # this allows rules/routing to be altered by supplying this function
 # in an included file, such as ovpn_env.sh
 function setupIptablesAndRouting {
    iptables -t nat -C POSTROUTING -s $OVPN_SERVER -o $OVPN_NATDEVICE -j MASQUERADE || {
      iptables -t nat -A POSTROUTING -s $OVPN_SERVER -o $OVPN_NATDEVICE -j MASQUERADE
    }
    for i in "${OVPN_ROUTES[@]}"; do
        iptables -t nat -C POSTROUTING -s "$i" -o $OVPN_NATDEVICE -j MASQUERADE || {
          iptables -t nat -A POSTROUTING -s "$i" -o $OVPN_NATDEVICE -j MASQUERADE
        }
    done
 }
 addArg "--config" "$OPENVPN/openvpn.conf"
 source "$OPENVPN/ovpn_env.sh"
 mkdir -p /dev/net
@ -59,42 +17,22 @@ if [ ! -c /dev/net/tun ]; then
    mknod /dev/net/tun c 10 200
 fi
-if [ -d "$OPENVPN/ccd" ]; then
+if [ ! -d "$OPENVPN/ccd" ]; then
-    addArg "--client-config-dir" "$OPENVPN/ccd"
+    mkdir -p /etc/openvpn/ccd
 fi
 # When using --net=host, use this to specify nat device.
 [ -z "$OVPN_NATDEVICE" ] && OVPN_NATDEVICE=eth0
 # Setup NAT forwarding if requested
 if [ "$OVPN_DEFROUTE" != "0" ] || [ "$OVPN_NAT" == "1" ] ; then
-	# call function to setup iptables rules and routing
+    iptables -t nat -C POSTROUTING -s $OVPN_SERVER -o eth0 -j MASQUERADE || {
-	# this allows rules to be customized by supplying
+      iptables -t nat -A POSTROUTING -s $OVPN_SERVER -o eth0 -j MASQUERADE
-	# a replacement function in, for example, ovpn_env.sh
+    }
-	setupIptablesAndRouting
+    for i in "${OVPN_ROUTES[@]}"; do
        iptables -t nat -C POSTROUTING -s "$i" -o eth0 -j MASQUERADE || {
          iptables -t nat -A POSTROUTING -s "$i" -o eth0 -j MASQUERADE
        }
    done
 fi
-# Use a copy of crl.pem as the CRL Needs to be readable by the user/group
+conf="$OPENVPN/openvpn.conf"
 # OpenVPN is running as.  Only pass arguments to OpenVPN if it's found.
 if [ "$EASYRSA_PKI/crl.pem" -nt "$OPENVPN/crl.pem" ]; then
    cp -f "$EASYRSA_PKI/crl.pem" "$OPENVPN/crl.pem"
    chmod 644 "$OPENVPN/crl.pem"
 fi
-if [ -r "$OPENVPN/crl.pem" ]; then
+exec openvpn --config "$conf"
    addArg "--crl-verify" "$OPENVPN/crl.pem"
 fi
 ip -6 route show default 2>/dev/null
 if [ $? = 0 ]; then
    echo "Enabling IPv6 Forwarding"
    # If this fails, ensure the docker container is run with --privileged
    # Could be side stepped with `ip netns` madness to drop privileged flag
    sysctl -w net.ipv6.conf.all.disable_ipv6=0 || echo "Failed to enable IPv6 support"
    sysctl -w net.ipv6.conf.default.forwarding=1 || echo "Failed to enable IPv6 Forwarding default"
    sysctl -w net.ipv6.conf.all.forwarding=1 || echo "Failed to enable IPv6 Forwarding"
 fi
 echo "Running 'openvpn ${ARGS[@]} ${USER_ARGS[@]}'"
 exec openvpn ${ARGS[@]} ${USER_ARGS[@]}
--- a/containerfiles/Containerfile
+++ b/containerfiles/Containerfile
@ -1,66 +0,0 @@
 FROM ghcr.io/allanger/dumb-downloader as dudo
 ARG OPENVPN_VERSION
 RUN apt update && apt install gnupg tar -y
 RUN mkdir /output
 # ------------------------------------------------------
 # -- Downlaod OpenVPN
 # ------------------------------------------------------
 RUN dudo -l "https://keys.openpgp.org/vks/v1/by-fingerprint/F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7" -d security-openvpn-net.asc -p DUMMY
 RUN gpg --import security-openvpn-net.asc
 RUN dudo -l "https://swupdate.openvpn.org/community/releases/openvpn-{{ version }}.tar.gz.asc" -d /tmp/openvpn.asc -p ${OPENVPN_VERSION}
 # ------------------------------------------------------
 # -- todo: I should fix it later
 # ------------------------------------------------------
 # RUN gpg  --no-tty --verify /tmp/openvpn.asc
 RUN dudo -l "https://swupdate.openvpn.org/community/releases/openvpn-{{ version }}.tar.gz " -d /tmp/openvpn.tar.gz -p ${OPENVPN_VERSION}
 RUN tar -xf /tmp/openvpn.tar.gz  -C /tmp && rm -f /tmp/openvpn.tar.gz
 RUN mv /tmp/openvpn-${OPENVPN_VERSION} /output/openvpn
 FROM ubuntu:22.04 as builder
 # ------------------------------------------------------
 # -- TODO: Define it only once
 # ------------------------------------------------------
 ARG OPENVPN_VERSION
 COPY --from=dudo /output /src
 RUN apt-get update &&\
      apt-get install -y wget tar unzip build-essential \
      libssl-dev iproute2 liblz4-dev liblzo2-dev \
      libpam0g-dev libpkcs11-helper1-dev libsystemd-dev \
      easy-rsa iptables pkg-config libcap-ng-dev
 WORKDIR /src/openvpn
 RUN ./configure --disable-systemd --enable-async-push --enable-iproute2
 RUN make && make install
 RUN mkdir /output
 RUN cp $(which openvpn) /output/
 # ------------------------------------------------------
 # -- Final container
 # ------------------------------------------------------
 FROM ubuntu:22.04
 LABEL maintainer="allanger <allanger@zohomail.com>"
 COPY --from=builder /output /src
 # -------------------------------------------------------
 # -- Prepare system deps
 # -------------------------------------------------------
 RUN apt update && apt install openvpn easy-rsa iptables -y && \
  mv /src/openvpn $(which openvpn)
 # Needed by scripts
 ENV OPENVPN /etc/openvpn
 # Prevents refused client connection because of an expired CRL
 ENV EASYRSA_CRL_DAYS 3650
 VOLUME ["/etc/openvpn"]
 # Internally uses port 1194, remap if needed using `docker run -p 443:1194/tcp`
 EXPOSE 1194
 CMD ["ovpn_run"]
 COPY --chmod='755' ./bin /usr/local/bin
 # -----------------------------------------------------------
 # -- Add support for OTP authentication using a PAM module
 # -- I have no idea how it works yet
 # -----------------------------------------------------------
 WORKDIR /etc/openvpn
--- a/containerfiles/Containerfile-XOR
+++ b/containerfiles/Containerfile-XOR
@ -1,78 +0,0 @@
 FROM ghcr.io/allanger/dumb-downloader as dudo
 ARG OPENVPN_VERSION
 ARG TUNNELBLICK_VERSION
 RUN apt update && apt install gnupg tar -y
 RUN mkdir /output
 # ------------------------------------------------------
 # -- Downlaod OpenVPN
 # ------------------------------------------------------
 RUN dudo -l "https://keys.openpgp.org/vks/v1/by-fingerprint/F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7" -d security-openvpn-net.asc -p DUMMY
 RUN gpg --import security-openvpn-net.asc
 RUN dudo -l "https://swupdate.openvpn.org/community/releases/openvpn-{{ version }}.tar.gz.asc" -d /tmp/openvpn.asc -p $OPENVPN_VERSION
 # ------------------------------------------------------
 # -- I should fix it later
 # ------------------------------------------------------
 # RUN gpg  --no-tty --verify /tmp/openvpn.asc
 RUN dudo -l "https://swupdate.openvpn.org/community/releases/openvpn-{{ version }}.tar.gz " -d /tmp/openvpn.tar.gz -p $OPENVPN_VERSION
 RUN tar -xf /tmp/openvpn.tar.gz  -C /tmp && rm -f /tmp/openvpn.tar.gz
 RUN mv /tmp/openvpn-$OPENVPN_VERSION /output/openvpn
 # ------------------------------------------------------
 # -- Download Tunnelblick
 # ------------------------------------------------------
 RUN dudo -l "https://github.com/Tunnelblick/Tunnelblick/archive/refs/tags/v{{ version }}.tar.gz" -d /tmp/tunnelblick.tar.gz -p $TUNNELBLICK_VERSION
 RUN tar -xf /tmp/tunnelblick.tar.gz  -C /tmp && rm -f /tmp/tunnelblick.tar.gz
 RUN mv /tmp/Tunnelblick-$TUNNELBLICK_VERSION /output/tunnelblick
 FROM ubuntu:24.04 as builder
 # ------------------------------------------------------
 # -- TODO: Define it only once
 # ------------------------------------------------------
 ARG OPENVPN_VERSION
 ARG TUNNELBLICK_VERSION
 COPY --from=dudo /output /src
 RUN apt-get update &&\
      apt-get install -y wget tar unzip build-essential \
      libssl-dev iproute2 liblz4-dev liblzo2-dev \
      libpam0g-dev libpkcs11-helper1-dev libsystemd-dev \
      easy-rsa iptables pkg-config libcap-ng-dev
 RUN cp /src/tunnelblick/third_party/sources/openvpn/openvpn-$OPENVPN_VERSION/patches/*.diff /src/openvpn
 WORKDIR /src/openvpn
 RUN for patch in $(find -type f | grep diff); do\
        patch -p1 < $patch;\
    done
 RUN ./configure --disable-systemd --enable-async-push --enable-iproute2
 RUN make && make install
 RUN mkdir /output
 RUN cp $(which openvpn) /output/
 # ------------------------------------------------------
 # -- Final container
 # ------------------------------------------------------
 FROM ubuntu:24.04
 LABEL maintainer="allanger <allanger@zohomail.com>"
 COPY --from=builder /output /src
 # -------------------------------------------------------
 # -- Prepare system deps
 # -------------------------------------------------------
 RUN apt update && apt install openvpn easy-rsa iptables -y && \
  mv /src/openvpn $(which openvpn)
 # Needed by scripts
 ENV OPENVPN /etc/openvpn
 # Prevents refused client connection because of an expired CRL
 ENV EASYRSA_CRL_DAYS 3650
 VOLUME ["/etc/openvpn"]
 # Internally uses port 1194, remap if needed using `docker run -p 443:1194/tcp`
 EXPOSE 1194
 CMD ["ovpn_run"]
 COPY --chmod='755' ./bin /usr/local/bin
 # -----------------------------------------------------------
 # -- Add support for OTP authentication using a PAM module
 # -- I have no idea how it works yet
 # -----------------------------------------------------------
 WORKDIR /etc/openvpn
--- a/docs/advanced.md
+++ b/docs/advanced.md
@ -4,7 +4,7 @@ The [`ovpn_genconfig`](/bin/ovpn_genconfig) script is intended for simple config
 ## Create host volume mounts rather than data volumes
-* Refer to the Quick Start document, and substitute `-v $OVPN_DATA:/etc/openvpn` with `-v /path/on/host/openvpn0:/etc/openvpn`
+* Refer to the Quick Start document, and substitute `--volumes-from $OVPN_DATA` with `-v /path/on/host/openvpn0:/etc/openvpn`
 * Quick example that is likely to be out of date, but here's how to get started:
        mkdir openvpn0
--- a/docs/backup.md
+++ b/docs/backup.md
@ -2,20 +2,17 @@
 ## Security
-The resulting archive from this backup contains all credential to impersonate the server at a minimum.  If the client's private keys are generated using the EasyRSA utility then it also contains the client certificates that could be used to impersonate said clients.  Most importantly, if the certificate authority key is in this archive (as it is given the quick start directions), then a adversary could generate certificates at will.
+The resulting archive from this back-up contains all credential to impersonate the server at a minimum.  If the client private keys are generated using the EasyRSA utility then it also contains the client certificates that could be used to impersonate said clients.  Most importantly, if the certificate authority key is in this archive (as it is given the quick start directions), then a adversary could generate certificates at will.
-I'd recommend encrypting the archive with something strong (e.g. gpg or openssl + AES).  For the paranoid keep backup offline.  For the [truly paranoid users](/docs/paranoid.md), never keep any keys (i.e. client and certificate authority) in the docker container to begin with :).
+I'd recommend encrypting the archive with something strong (e.g. gpg or openssl + AES).  For the paranoid keep backup offline.  For the truly paranoid users, never keep any keys (i.e. client and certificate authority) in the docker container to begin with :).
-**TL;DR Protect the resulting archive file.  Ensure there is very limited access to it.**
+TL;DR Protect the resulting archive file, by ensure there is very limited access to it.
 ## Backup to Archive
-    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn tar -cvf - -C /etc openvpn | xz > openvpn-backup.tar.xz
+    docker run --volumes-from $OVPN_DATA --rm busybox tar -cvf - -C /etc openvpn | xz > openvpn-backup.tar.xz
-## Restore to New Data Volume
+## Retore to New Image
-Creates an volume container named `$OVPN_DATA` to extract the data to.
+    xzcat openvpn-backup.tar.xz | docker run --name $OVPN_DATA -v /etc/openvpn -i busybox tar -xvf - -C /etc
    docker volume create --name $OVPN_DATA
    xzcat openvpn-backup.tar.xz | docker run -v $OVPN_DATA:/etc/openvpn -i kylemanna/openvpn tar -xvf - -C /etc
--- a/docs/clients.md
+++ b/docs/clients.md
@ -1,6 +1,6 @@
-# Advanced Client Management
+# Advanced client management
-## Client Configuration Mode
+## Client configuration mode
 The [`ovpn_getclient`](/bin/ovpn_getclient) can produce two different versions of the configuration.
@ -9,39 +9,20 @@ The [`ovpn_getclient`](/bin/ovpn_getclient) can produce two different versions o
 Note that some client software might be picky about which configuration format it accepts.
-## Client List
+## Batch mode
 See an overview of the configured clients, including revocation and expiration status:
    docker run --rm -it -v $OVPN_DATA:/etc/openvpn kylemanna/openvpn ovpn_listclients
 The output is generated using `openssl verify`. Error codes from the verification process different from `X509_V_ERR_CERT_HAS_EXPIRED` or `X509_V_ERR_CERT_REVOKED` will show the status `INVALID`.
 ## Batch Mode
 If you have more than a few clients, you will want to generate and update your client configuration in batch. For this task the script [`ovpn_getclient_all`](/bin/ovpn_getclient_all) was written, which writes out the configuration for each client to a separate directory called `clients/$cn`.
 Execute the following to generate the configuration for all clients:
-    docker run --rm -it -v $OVPN_DATA:/etc/openvpn --volume /tmp/openvpn_clients:/etc/openvpn/clients kylemanna/openvpn ovpn_getclient_all
+    docker run --rm -t -i -v /tmp/openvpn:/etc/openvpn kylemanna/openvpn ovpn_getclient_all
 After doing so, you will find the following files in each of the `$cn` directories:
    ca.crt
    dh.pem
    $cn-combined.ovpn # Combined configuration file format. If your client recognices this file then only this file is needed.
    $cn.ovpn          # Separated configuration. This configuration file requires the other files ca.crt dh.pem $cn.crt $cn.key ta.key
    $cn.crt
    $cn.key
    ta.key
 ## Revoking Client Certificates
 Revoke `client1`'s certificate and generate the certificate revocation list (CRL) using [`ovpn_revokeclient`](/bin/ovpn_revokeclient) script :
    docker run --rm -it -v $OVPN_DATA:/etc/openvpn kylemanna/openvpn ovpn_revokeclient client1
 The OpenVPN server will read this change every time a client connects (no need to restart server) and deny clients access using revoked certificates.
 You can optionally pass `remove` as second parameter to ovpn_revokeclient to remove the corresponding crt, key and req files :
    docker run --rm -it -v $OVPN_DATA:/etc/openvpn kylemanna/openvpn ovpn_revokeclient client1 remove
--- a/docs/debug.md
+++ b/docs/debug.md
@ -4,10 +4,10 @@ Random things I do to debug the containers.
 ## Login Shells
-* Create a shell in the running docker container with `docker exec`.
+* Create a shell in the running docker container (aka namespace) with [nsenter](https://github.com/jpetazzo/nsenter)
-* To modify the data, you can also mount the data container and modify it with
+* If you don't have nsenter/docker-enter, you can mount the data container and modify it with
-        docker run --rm -it -v $OVPN_DATA:/etc/openvpn kylemanna/openvpn bash -l
+        docker run --rm -it --volumes-from $OVPN_DATA kylemanna/openvpn bash -l
 ## Stream OpenVPN Logs
--- a/docs/docker-compose.md
+++ b/docs/docker-compose.md
@ -1,77 +0,0 @@
 # Quick Start with docker-compose
 * Add a new service in docker-compose.yml
 ```yaml
 version: '2'
 services:
  openvpn:
    cap_add:
     - NET_ADMIN
    image: kylemanna/openvpn
    container_name: openvpn
    ports:
     - "1194:1194/udp"
    restart: always
    volumes:
     - ./openvpn-data/conf:/etc/openvpn
 ```
 * Initialize the configuration files and certificates
 ```bash
 docker-compose run --rm openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
 docker-compose run --rm openvpn ovpn_initpki
 ```
 * Fix ownership (depending on how to handle your backups, this may not be needed)
 ```bash
 sudo chown -R $(whoami): ./openvpn-data
 ```
 * Start OpenVPN server process
 ```bash
 docker-compose up -d openvpn
 ```
 * You can access the container logs with
 ```bash
 docker-compose logs -f
 ```
 * Generate a client certificate
 ```bash
 export CLIENTNAME="your_client_name"
 # with a passphrase (recommended)
 docker-compose run --rm openvpn easyrsa build-client-full $CLIENTNAME
 # without a passphrase (not recommended)
 docker-compose run --rm openvpn easyrsa build-client-full $CLIENTNAME nopass
 ```
 * Retrieve the client configuration with embedded certificates
 ```bash
 docker-compose run --rm openvpn ovpn_getclient $CLIENTNAME > $CLIENTNAME.ovpn
 ```
 * Revoke a client certificate
 ```bash
 # Keep the corresponding crt, key and req files.
 docker-compose run --rm openvpn ovpn_revokeclient $CLIENTNAME
 # Remove the corresponding crt, key and req files.
 docker-compose run --rm openvpn ovpn_revokeclient $CLIENTNAME remove
 ```
 ## Debugging Tips
 * Create an environment variable with the name DEBUG and value of 1 to enable debug output (using "docker -e").
 ```bash
 docker-compose run -e DEBUG=1 -p 1194:1194/udp openvpn
 ```
--- a/docs/docker-openvpn.te
+++ b/docs/docker-openvpn.te
@ -1,10 +0,0 @@
 module docker-openvpn 1.0;
 require {
 	type svirt_lxc_net_t;
 	class tun_socket create;
 }
 #============= svirt_lxc_net_t ==============
 allow svirt_lxc_net_t self:tun_socket create;
--- a/docs/docker.md
+++ b/docs/docker.md
@ -1,52 +0,0 @@
 # Install Latest Docker Service
 Docker included with some distributions lags far behind upstream.  This guide aims to provide a quick and reliable way to install or update it.
 It is recommended to use platforms that support systemd as future versions of this docker image may require systemd to help with some tasks:
 * Fedora
 * Debian 8.1+
 ## Debian / Ubuntu
 ### Step 1 — Set Up Docker
 Docker is moving fast and Debian / Ubuntu's long term support (LTS) policy doesn't keep up. To work around this we'll install a PPA that will get us the latest version of Docker. For Debian Jessie users, just install docker.io from jessie-backports.
 Ensure dependencies are installed:
    sudo apt-get update && sudo apt-get install -y apt-transport-https curl
 Add the upstream Docker repository package signing key. The apt-key command uses elevated privileges via sudo, so a password prompt for the user's password may appear:
    curl -L https://get.docker.com/gpg | sudo apt-key add -
 Add the upstream Docker repository to the system list:
    echo deb https://get.docker.io/ubuntu docker main | sudo tee /etc/apt/sources.list.d/docker.list
 Update the package list and install the Docker package:
    sudo apt-get update && sudo apt-get install -y lxc-docker
 Add your user to the `docker` group to enable communication with the Docker daemon as a normal user, where `$USER` is your username. Exit and log in again for the new group to take effect:
    sudo usermod -aG docker $USER
 After **re-logging in** verify the group membership using the id command. The expected response should include docker like the following example:
    uid=1001(test0) gid=1001(test0) groups=1001(test0),27(sudo),999(docker)
 ### Step 2 — Test Docker
 Run a Debian jessie docker container:
    docker run --rm -it debian:jessie bash -l
 Once inside the container you'll see the `root@<container id>:/#` prompt signifying that the current shell is in a Docker container. To confirm that it's different from the host, check the version of Debian running in the container:
    cat /etc/issue.net
 Expected result:
    Debian GNU/Linux 8
--- a/docs/faqs.md
+++ b/docs/faqs.md
@ -1,26 +1,7 @@
 # Frequently Asked Questions
 ## How do I edit `openvpn.conf`?
 Use a Docker image with an editor and connect the volume container:
    docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn vi /etc/openvpn/openvpn.conf
 ## Why not keep everything in one image?
 The run-time image (`kylemanna/openvpn`) is intended to be an ephemeral image. Nothing should be saved in it so that it can be re-downloaded and re-run when updates are pushed (i.e. newer version of OpenVPN or even Debian). The data container contains all this data and is attached at run time providing a safe home.
 If it was all in one container, an upgrade would require a few steps to extract all the data, perform some upgrade import, and re-run. This technique is also prone to people losing their EasyRSA PKI when they forget where it was.  With everything in the data container upgrading is as simple as re-running `docker pull kylemanna/openvpn` and then `docker run ... kylemanna/openvpn`.
 ## How do I set up a split tunnel?
 Split tunnels are configurations where only some of the traffic from a client goes to the VPN, with the remainder routed through the normal non-VPN interfaces. You'll want to disable a default route (-d) when you generate the configuration, but still use NAT (-N) to keep network address translation enabled.
    ovpn_genconfig -N -d ...
 ## I need to add some extra configurations to openvpn.conf, How can I do that ?
 You can pass multiple (**-e**) options to `ovpn_genconfig`. For example, if you need to add _'duplicate-cn'_ and _'topology subnet'_ to the server configuration you could do something like this:
    ovpn_genconfig -e 'duplicate-cn' -e 'topology subnet' -u udp://VPN.SERVERNAME.COM
--- a/docs/ipv6.md
+++ b/docs/ipv6.md
@ -1,101 +0,0 @@
 # IPv6 Support
 This is a work in progress, more polish to follow.
 ## Tunnel IPv6 Address To OpenVPN Clients
 This feature is advanced and recommended only for those who already have a functioning IPv4 tunnel and know how IPv6 works.
 Systemd is used to setup a static route and Debian 8.1 or later is recommended as the host distribution.  Others probably work, but haven't been tested.
 ### Step 1 — Setup IPv6 on the Host Machine
 The tutorial uses a free tunnel from [tunnelbroker.net](https://tunnelbroker.net/) to get a /64 and /48 prefix allocated to me.  The tunnel endpoint is less then 3 ms away from Digital Ocean's San Francisco datacenter.
 Place the following in `/etc/network/interfaces`.  Replace `PUBLIC_IP` with your host's public IPv4 address and replace 2001:db8::2 and 2001:db8::1 with the corresponding tunnel endpoints:
    auto he-ipv6
    iface he-ipv6 inet6 v4tunnel
        address 2001:db8::2
        netmask 64
        endpoint 72.52.104.74
        local PUBLIC_IP
        ttl 255
        gateway 2001:db8::1
 Bring the interface up:
    ifup he-ipv6
 Test that IPv6 works on the host:
    ping6 google.com
 If this doesn't work, figure it out.  It may be necessary to add an firewall rule to allow IP protocol 41 through the firewall.
 ### Step 2 — Update Docker's Init To Enable IPv6 Support
 Add the `--ipv6` to the Docker daemon invocation.
 On **Ubuntu** and old versions of Debian Append the `--ipv6` argument to the `DOCKER_OPTS` variable in:
    /etc/default/docker
 On modern **systemd** distributions copy the service file and modify it and reload the service:
    sed -e 's:^\(ExecStart.*\):\1 --ipv6:' /lib/systemd/system/docker.service | tee /etc/systemd/system/docker.service
    systemctl restart docker.service
 ### Step 3 — Setup the systemd Unit File
 Copy the systemd init file from the docker-openvpn /init directory of the repository and install into `/etc/systemd/system/docker-openvpn.service`
    curl -o /etc/systemd/system/docker-openvpn@.service 'https://raw.githubusercontent.com/kylemanna/docker-openvpn/dev/init/docker-openvpn%40.service'
 Edit the file, replace `IP6_PREFIX` value with the value of your /64 prefix.
    vi /etc/systemd/system/docker-openvpn@.service
 Finally, reload systemd so the changes take affect:
    systemctl daemon-reload
 ### Step 4 — Start OpenVPN
 Ensure that OpenVPN has been initialized and configured as described in the top level `README.md`.
 Start the systemd service file specifying the volume container suffix as the instance.  For example, `INSTANCE=test0` has a docker volume container named `ovpn-data-test0` and service will create `ovpn-test0` container:
    systemctl start docker-openvpn@test0
 Verify logs if needed:
    systemctl status docker-openvpn@test0
    docker logs ovpn-test0
 ### Step 4 — Modify Client Config for IPv6 Default Route
 Append the default route for the public Internet:
    echo "route-ipv6 2000::/3" >> clientname.ovpn
 ### Step 5 — Start up Client
 If all went according to plan, then `ping6 2600::` and `ping6 google.com` should work.
 Fire up a web browser and attempt to navigate to [https://ipv6.google.com](https://ipv6.google.com).
 ## Connect to the OpenVPN Server Over IPv6
 This feature requires a docker daemon with working IPv6 support.
 This will allow connections over IPv4 and IPv6.
 Generate server configuration with the udp6 or tcp6 protocol:
    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u udp6://VPN.SERVERNAME.COM
    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u tcp6://VPN.SERVERNAME.COM
--- a/docs/otp.md
+++ b/docs/otp.md
@ -1,76 +0,0 @@
 # Using two factor authentication for users
 Instead of relying on complex passwords for client certificates (that usually get written somewhere) this image
 provides support for two factor authentication with OTP devices.
 The most common app that provides OTP generation is Google Authenticator ([iOS](https://itunes.apple.com/it/app/google-authenticator/id388497605?mt=8) and
 [Android](https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=it)) you can download it
 and use this image to generate user configuration.
 ## Usage
 In order to enable two factor authentication the following steps are required.
 * Choose a more secure [cipher](https://community.openvpn.net/openvpn/wiki/SWEET32) to use because since [OpenVPN 2.3.13](https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.13) the default openvpn cipher BF-CBC will cause a renegotiated connection every 64 MB of data
 * Generate server configuration with `-2` and `-C $CIPHER` options
        docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u udp://vpn.example.com -2 -C $CIPHER
 * Generate your client certificate (possibly without a password since you're using OTP)
        docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn easyrsa build-client-full <user> nopass
 * Generate authentication configuration for your client. -t is needed to show QR code, -i is optional for interactive usage
        docker run -v $OVPN_DATA:/etc/openvpn --rm -t kylemanna/openvpn ovpn_otp_user <user>
 The last step will generate OTP configuration for the provided user with the following options
 ```
 google-authenticator --time-based --disallow-reuse --force --rate-limit=3 --rate-time=30 --window-size=3 \
    -l "${1}@${OVPN_CN}" -s /etc/openvpn/otp/${1}.google_authenticator
 ```
 It will also show a shell QR code in terminal you can scan with the Google Authenticator application. It also provides
 a link to a google chart url that will display a QR code for the authentication.
 **Do not share QR code (or generated url) with anyone but final user, that is your second factor for authentication
  that is used to generate OTP codes**
 Here's an example QR code generated for an hypotetical user@example.com user.
 ![Example QR Code](https://www.google.com/chart?chs=200x200&chld=M|0&cht=qr&chl=otpauth://totp/user@example.com%3Fsecret%3DKEYZ66YEXMXDHPH5)
 Generate client configuration for `<user>` and import it in OpenVPN client. On connection it will prompt for user and password.
 Enter your username and a 6 digit code generated by Authenticator app and you're logged in.
 ## TL;DR
 Under the hood this configuration will setup an `openvpn` PAM service configuration (`/etc/pam.d/openvpn`)
 that relies on the awesome [Google Authenticator PAM module](https://github.com/google/google-authenticator).
 In this configuration the `auth` part of PAM flow is managed by OTP codes and the `account` part is not enforced
 because you're likely dealing with virtual users and you do not want to create a system account for every VPN user.
 `ovpn_otp_user` script will store OTP credentials under `/etc/openvpn/otp/<user>.google_authentication`. In this
 way when you take a backup OTP users are included as well.
 Finally it will enable the openvpn plugin `openvpn-plugin-auth-pam.so` in server configuration and append the
 `auth-user-pass` directive in client configuration.
 ## Debug
 If something is not working you can verify your PAM setup with these commands
 ```
 # Start a shell in container
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn bash
 # Then in container you have pamtester utility already installed
 which pamtester
 # To check authentication use this command that will prompt for a valid code from Authenticator APP
 pamtester -v openvpn <user> authenticate
 ```
 In the last command `<user>` should be replaced by the exact string you used in the ovpn_otp_user command.
 If you configured everything correctly you should get authenticated by entering a OTP code from the app.
--- a/docs/paranoid.md
+++ b/docs/paranoid.md
@ -1,49 +1,11 @@
 # Advanced security
 ## Keep the CA root key safe
 As mentioned in the [backup section](/docs/backup.md), there are good reasons to not generate the CA and/or leave it on the server. This document describes how you can generate the CA and all your certificates on a secure machine and then copy only the needed files (which never includes the CA root key obviously ;) ) to the server(s) and clients.
-Execute the following commands. Note that you might want to change the volume `$PWD` or use a data docker container for this.
+Execute the following commands. Note that you might want to change the volume `/tmp/openvpn` to persistent storage or use a data docker container for this.
-    docker run --net=none --rm -t -i -v $PWD:/etc/openvpn kylemanna/openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
+    docker run --rm -t -i -v /tmp/openvpn:/etc/openvpn kylemanna/openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
-    docker run --net=none --rm -t -i -v $PWD:/etc/openvpn kylemanna/openvpn ovpn_initpki
+    docker run --rm -t -i -v /tmp/openvpn:/etc/openvpn kylemanna/openvpn ovpn_initpki
-    docker run --net=none --rm -t -i -v $PWD:/etc/openvpn kylemanna/openvpn ovpn_copy_server_files
+    docker run --rm -t -i -v /tmp/openvpn:/etc/openvpn kylemanna/openvpn ovpn_copy_server_files
 The [`ovpn_copy_server_files`](/bin/ovpn_copy_server_files) script puts all the needed configuration in a subdirectory which defaults to `$OPENVPN/server`. All you need to do now is to copy this directory to the server and you are good to go.
 ## Crypto Hardening
 If you want to select the ciphers used by OpenVPN the following parameters of the `ovpn_genconfig` might interest you:
    -T    Encrypt packets with the given cipher algorithm instead of the default one (tls-cipher).
    -C    A list of allowable TLS ciphers delimited by a colon (cipher).
    -a    Authenticate  packets with HMAC using the given message digest algorithm (auth).
 The following options have been tested successfully:
    docker run -v $OVPN_DATA:/etc/openvpn --net=none --rm kylemanna/openvpn ovpn_genconfig -C 'AES-256-CBC' -a 'SHA384'
 Changing the `tls-cipher` option seems to be more complicated because some clients (namely NetworkManager in Debian Jessie) seem to have trouble with this. Running `openvpn` manually also did not solve the issue:
    TLS Error: TLS key negotiation failed to occur within 60 seconds (check your network connectivity)
    TLS Error: TLS handshake failed
 ## EasyRSA and 4096 bit RSA Keys
 EasyRSA will generate 4096 bit RSA keys when the `-e EASYRSA_KEY_SIZE=4096` argument is added to `ovpn_initpki` and `easyrsa build-client-full` commands.
    docker run -e EASYRSA_KEY_SIZE=4096 -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn ovpn_initpki
    docker run -e EASYRSA_KEY_SIZE=4096 -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn easyrsa build-client-full CLIENTNAME nopass
 ## Logging and stdout
 Because you are running within Docker, remember that any command that generates output to stdout may also log that output through Docker's log-driver mechanism. That may mean that e.g. keying material generated by `ovpn_getclient` will be logged somewhere that you don't want it to be logged.
 A simple way to avoid having Docker log output for a given command is to run with `--log-driver=none`, e.g
    docker run -v $OVPN_DATA:/etc/openvpn --log-driver=none --rm kylemanna/openvpn ovpn_getclient USER > USER.ovpn
 ## Additional Resources
 Have a look at the [Applied-Crypto-Hardening](https://github.com/BetterCrypto/Applied-Crypto-Hardening/tree/master/src/configuration/VPNs/OpenVPN) project for more examples.
--- a/docs/selinux.md
+++ b/docs/selinux.md
@ -1,25 +0,0 @@
 # For hosts that use SELinux
 Try this [policy file](docker-openvpn.te)
 Run these commands to compile and load it:
 ```
 checkmodule -M -m -o docker-openvpn.mod docker-openvpn.te
 semodule_package -o docker-openvpn.pp -m docker-openvpn.mod
 sudo semodule -i docker-openvpn.pp
 ```
 Also, some configurations don't allow containers to load kernel modules, so on the host run this:
 ```
 sudo modprobe tun
 ```
 So the container doesn't have to load the `tun` module.
 # Still having issues?
 In January 2016, Fedora based systems got an update that fixed an issue for labeling namespaced net objects under /proc
 to fix, make sure that you have run `sudo dnf update` and you need to reboot to load the new policies
--- a/docs/static-ips.md
+++ b/docs/static-ips.md
@ -1,12 +1,12 @@
 # Static IP Addresses
-The docker image is setup for static client configuration on the 192.168.254.0/24 subnet.  To use it follow the Quick Start section below.  Note that the IP addresses octets need to be picked special, see [OpenVPN Documentation](https://openvpn.net/index.php/open-source/documentation/howto.html#policy) for more details.
+The docker image is setup for static client configuration on the 192.168.254.0/24 subnet.  To use it follow the Quick Start section below.  Note that the IP addresses octects need to be picked special, see [OpenVPN Documentation](https://openvpn.net/index.php/open-source/documentation/howto.html#policy) for more details.
 ## Quick Start
 1. Create a client specific configuration:
-        $ echo "ifconfig-push 192.168.254.1 192.168.254.2" | docker run -v $OVPN_DATA:/etc/openvpn -i --rm kylemanna/openvpn tee /etc/openvpn/ccd/CERT_COMMON_NAME
+        $ echo "ifconfig-push 192.168.254.1 192.168.254.2" | docker run --volumes-from $OVPN_DATA -i --rm kylemanna/openvpn tee /etc/openvpn/ccd/CERT_COMMON_NAME
        ifconfig-push 192.168.254.1 192.168.254.2
 2. Wait for client to reconnect if necessary
@ -15,10 +15,10 @@ The docker image is setup for static client configuration on the 192.168.254.0/2
 Login to the data volume with a `bash` container, note only changes in /etc/openvpn will persist:
-    docker run -v $OVPN_DATA:/etc/openvpn -it --rm kylemanna/openvpn bash -l
+    docker run --volumes-from $OVPN_DATA -it --rm kylemanna/openvpn bash -l
 ## Upgrading from Old OpenVPN Configurations
 If you're running an old configuration and need to upgrade it to pull in the ccd directory run the following:
-    docker run  -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig
+    docker run  --volumes-from $OVPN_DATA --rm kylemanna/openvpn ovpn_genconfig
--- a/docs/systemd.md
+++ b/docs/systemd.md
@ -1,43 +0,0 @@
 # Docker + OpenVPN systemd Service
 The systemd service aims to make the update and invocation of the
 `docker-openvpn` container seamless.  It automatically downloads the latest
 `docker-openvpn` image and instantiates a Docker container with that image.  At
 shutdown it cleans-up the old container.
 In the event the service dies (crashes, or is killed) systemd will attempt to
 restart the service every 10 seconds until the service is stopped with
 `systemctl stop docker-openvpn@NAME.service`.
 A number of IPv6 hacks are incorporated to workaround Docker shortcomings and
 are harmless for those not using IPv6.
 To use and enable automatic start by systemd:
 1. Create a Docker volume container named `ovpn-data-NAME` where `NAME` is the
   user's choice to describe the use of the container.  In this example
   configuration, `NAME=example`.
        OVPN_DATA="ovpn-data-example"
        docker volume create --name $OVPN_DATA
 2. Initialize the data container, but don't start the container :
       docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u udp://VPN.SERVERNAME.COM
       docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn ovpn_initpki
 3. Download the [docker-openvpn@.service](https://raw.githubusercontent.com/kylemanna/docker-openvpn/master/init/docker-openvpn%40.service)
   file to `/etc/systemd/system`:
        curl -L https://raw.githubusercontent.com/kylemanna/docker-openvpn/master/init/docker-openvpn%40.service | sudo tee /etc/systemd/system/docker-openvpn@.service
 4. Enable and start the service with:
        systemctl enable --now docker-openvpn@example.service
 5. Verify service start-up with:
        systemctl status docker-openvpn@example.service
        journalctl --unit docker-openvpn@example.service
 For more information, see the [systemd manual pages](https://www.freedesktop.org/software/systemd/man/index.html).
--- a/docs/tcp.md
+++ b/docs/tcp.md
@ -1,45 +0,0 @@
 # TCP Protocol
 ## TCP vs. UDP - Pros & Cons
 By default, OpenVPN is configured to use the UDP protocol.  Because UDP incurs minimal protocol overhead (for example, no acknowledgment is required upon successful packet receipt), it can sometimes result in slightly faster throughput.  However, in situations where VPN service is needed over an unreliable connection, the user experience can benefit from the extra diagnostic features of the TCP protocol.
 As an example, users connecting from an airplane wifi network may experience high packet drop rates, where the error detection and sliding window control of TCP can more readily adjust to the inconsistent connection.
 Another example would be trying to open a VPN connection from within a very restrictive network. In some cases port 1194, or even UDP traffic on any port, may be restricted by network policy. Because TCP traffic on port 443 is used for normal TLS (https) web browsing, it is very unlikely to be blocked.
 ## Using TCP
 Those requiring TCP connections should initialize the data container by specifying the TCP protocol and port number:
    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig -u tcp://VPN.SERVERNAME.COM:443
    docker run -v $OVPN_DATA:/etc/openvpn --rm -it kylemanna/openvpn ovpn_initpki
 Because the server container always exposes port 1194, regardless of the
 specified protocol, adjust the mapping appropriately:
    docker run -v $OVPN_DATA:/etc/openvpn -d -p 443:1194/tcp --cap-add=NET_ADMIN kylemanna/openvpn
 ## Running a Second Fallback TCP Container
 Instead of choosing between UDP and TCP, you can use both. A single instance of OpenVPN can only listen for a single protocol on a single port, but this image makes it easy to run two instances simultaneously. After building, configuring, and starting a standard container listening for UDP traffic on 1194, you can start a second container listening for tcp traffic on port 443:
    docker run -v $OVPN_DATA:/etc/openvpn --rm -p 443:1194/tcp --privileged kylemanna/openvpn ovpn_run --proto tcp
 `ovpn_run` will load all the values from the default config file, and `--proto tcp` will override the protocol setting.
 This allows you to use UDP most of the time, but fall back to TCP on the rare occasion that you need it.
 Note that you will need to configure client connections manually. At this time it is not possible to generate a client config that will automatically fall back to the TCP connection.
 ## Forward HTTP/HTTPS connection to another TCP port
 You might run into cases where you want your OpenVPN server listening on TCP port 443 to allow connection behind a restricted network, but you already have a webserver on your host running on that port. OpenVPN has a built-in option named `port-share` that allow you to proxy incoming traffic that isn't OpenVPN protocol to another host and port.
 First, change the listening port of your existing webserver (for instance from 443 to 4433).
 Then initialize the data container by specifying the TCP protocol, port 443 and the port-share option:
    docker run -v $OVPN_DATA:/etc/openvpn --rm kylemanna/openvpn ovpn_genconfig \
    -u tcp://VPN.SERVERNAME.COM:443 \
    -e 'port-share VPN.SERVERNAME.COM 4433'
 Then proceed to initialize the pki, create your users and start the container as usual.
 This will proxy all non OpenVPN traffic incoming on TCP port 443 to TCP port 4433 on the same host. This is currently only designed to work with HTTP or HTTPS protocol.
--- a/env/openvpn.env
+++ b/env/openvpn.env
@ -1,3 +0,0 @@
 export OPENVPN_VERSION=2.6.5
 export CONTAINERFILE=./containerfiles/Containerfile
 export SCRIPT=build_upstream.sh
--- a/env/openvpn_xor.env
+++ b/env/openvpn_xor.env
@ -1,3 +0,0 @@
 export TUNNELBLICK_VERSION=6.0beta03
 export CONTAINERFILE=./containerfiles/Containerfile-XOR
 export SCRIPT=build_xor.sh
--- a/init/docker-openvpn@.service
+++ b/init/docker-openvpn@.service
@ -1,76 +0,0 @@
 #
 # Docker + OpenVPN systemd service
 #
 # Author: Kyle Manna <kyle@kylemanna.com>
 # Source: https://github.com/kylemanna/docker-openvpn
 #
 # This service aims to make the update and invocation of the docker-openvpn
 # container seemless.  It automatically downloads the latest docker-openvpn
 # image and instantiates a Docker container with that image.  At shutdown it
 # cleans-up the old container.
 #
 # In the event the service dies (crashes, or is killed) systemd will attempt
 # to restart the service every 10 seconds until the service is stopped with
 # `systemctl stop docker-openvpn@NAME`.
 #
 # A number of IPv6 hacks are incorporated to workaround Docker shortcomings and
 # are harmless for those not using IPv6.
 #
 # To use:
 # 1. Create a Docker volume container named `ovpn-data-NAME` where NAME is the
 #    user's choice to describe the use of the container.
 # 2. Initialize the data container according to the docker-openvpn README, but
 #    don't start the container. Stop the docker container if started.
 # 3. Download this service file to /etc/systemd/service/docker-openvpn@.service
 # 4. Enable and start the service template with:
 #    `systemctl enable --now docker-openvpn@NAME.service`
 # 5. Verify service start-up with:
 #    `systemctl status docker-openvpn@NAME.service`
 #    `journalctl --unit docker-openvpn@NAME.service`
 #
 # For more information, see the systemd manual pages.
 #
 [Unit]
 Description=OpenVPN Docker Container
 Documentation=https://github.com/kylemanna/docker-openvpn
 After=network.target docker.service
 Requires=docker.service
 [Service]
 RestartSec=10
 Restart=always
 # Modify IP6_PREFIX to match network config
 #Environment="IP6_PREFIX=2001:db8::/64"
 #Environment="ARGS=--config openvpn.conf --server-ipv6 2001:db8::/64"
 Environment="NAME=ovpn-%i"
 Environment="DATA_VOL=ovpn-data-%i"
 Environment="IMG=kylemanna/openvpn:latest"
 Environment="PORT=1194:1194/udp"
 # To override environment variables, use local configuration directory:
 # /etc/systemd/system/docker-openvpn@foo.d/local.conf
 # http://www.freedesktop.org/software/systemd/man/systemd.unit.html
 # Clean-up bad state if still hanging around
 ExecStartPre=-/usr/bin/docker rm -f $NAME
 # Attempt to pull new image for security updates
 ExecStartPre=-/usr/bin/docker pull $IMG
 # IPv6: Ensure forwarding is enabled on host's networking stack (hacky)
 # Would be nice to use systemd-network on the host, but this doens't work
 # http://lists.freedesktop.org/archives/systemd-devel/2015-June/032762.html
 ExecStartPre=/bin/sh -c 'test -z "$IP6_PREFIX" && exit 0; sysctl net.ipv6.conf.all.forwarding=1'
 # Main process
 ExecStart=/usr/bin/docker run --rm --cap-add=NET_ADMIN -v ${DATA_VOL}:/etc/openvpn --name ${NAME} -p ${PORT} ${IMG} ovpn_run $ARGS
 # IPv6: Add static route for IPv6 after it starts up
 ExecStartPost=/bin/sh -c 'test -z "${IP6_PREFIX}" && exit 0; sleep 1; ip route replace ${IP6_PREFIX} via $(docker inspect -f "{{ .NetworkSettings.GlobalIPv6Address }}" $NAME ) dev docker0'
 # IPv6: Clean-up
 ExecStopPost=/bin/sh -c 'test -z "$IP6_PREFIX" && exit 0; ip route del $IP6_PREFIX dev docker0'
 [Install]
 WantedBy=multi-user.target
--- a/scripts/build_upstream.sh
+++ b/scripts/build_upstream.sh
@ -1,4 +0,0 @@
 #!/usr/bin/env sh
 export CUSTOM_TAG="v$OPENVPN_VERSION"
 export BUILD_ARGS="--build-arg OPENVPN_VERSION=$OPENVPN_VERSION"
 build-container
--- a/scripts/build_xor.sh
+++ b/scripts/build_xor.sh
@ -1,7 +0,0 @@
 #!/usr/bin/env sh
 git clone https://github.com/Tunnelblick/Tunnelblick.git /tmp/tunnelblick
 git -C /tmp/tunnelblick checkout $TUNNELBLICK_VERSION
 export OPENVPN_VERSION=$(ls /tmp/tunnelblick/third_party/sources/openvpn | sed 's/openvpn-//g' | sort  -k1,1nr -k2,2n -k3,3n | head -n 1)
 export CUSTOM_TAG="v$OPENVPN_VERSION-XOR-$TUNNELBLICK_VERSION"
 export BUILD_ARGS="--build-arg OPENVPN_VERSION=$OPENVPN_VERSION --build-arg TUNNELBLICK_VERSION=$TUNNELBLICK_VERSION"
 build-container
--- a/test/README.md
+++ b/test/README.md
@ -1,19 +0,0 @@
 # Tests
 Philosophy is to not re-invent the wheel while allowing users to quickly test repository specific tests.
 Example invocation from top-level of repository:
    docker build -t kylemanna/openvpn .
    test/run.sh kylemanna/openvpn
    # Be sure to pull kylemanna/openvpn:latest after you're done testing
 More details: https://github.com/docker-library/official-images/tree/master/test
 ## Continuous Integration
 The set of scripts defined by `config.sh` are run every time a pull request or push to the repository is made.
 ## Maintenance
 Periodically these scripts may need to be synchronized with their upsteam source.  Would be nice to be able to just use them from upstream if it such a feature is added later to avoid having to copy them in place.
--- a/test/client/wait-for-connect.sh
+++ b/test/client/wait-for-connect.sh
@ -1,38 +0,0 @@
 #!/bin/bash
 set -e
 [ -n "${DEBUG+x}" ] && set -x
 OPENVPN_CONFIG=${1:-/client/config.ovpn}
 # Run in background, rely on bash for job management
 openvpn --config "$OPENVPN_CONFIG" --management 127.0.0.1 9999 &
 # Spin waiting for interface to exist signifying connection
 timeout=10
 for i in $(seq $timeout); do
    # Break when connected
    #echo state | busybox nc 127.0.0.1 9999 | grep -q "CONNECTED,SUCCESS" && break;
    # Bash magic for tcp sockets
    if exec 3<>/dev/tcp/127.0.0.1/9999; then
        # Consume all header input
        while read -t 0.1 <&3; do true; done
        echo "state" >&3
        read -t 1 <&3
        echo -n $REPLY | grep -q "CONNECTED,SUCCESS" && break || true
        exec 3>&-
    fi
    # Else sleep
    sleep 1
 done
 if [ $i -ge $timeout ]; then
    echo "Error starting OpenVPN, i=$i, exiting."
    exit 2;
 fi
 # The show is over.
 kill %1
--- a/test/config.sh
+++ b/test/config.sh
@ -1,19 +0,0 @@
 #!/bin/bash
 set -e
 testAlias+=(
 	[kylemanna/openvpn]='openvpn'
 )
 imageTests+=(
 	[openvpn]='
 	paranoid
        conf_options
        client
        basic
        dual-proto
        otp
 	iptables
 	revocation
 	'
 )
--- a/test/run.sh
+++ b/test/run.sh
@ -1,202 +0,0 @@
 #!/bin/bash
 set -e
 dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 self="$(basename "$0")"
 usage() {
 	cat <<EOUSAGE
 usage: $self [-t test ...] image:tag [...]
   ie: $self debian:wheezy
       $self -t utc python:3
       $self -t utc python:3 -t python-hy
 This script processes the specified Docker images to test their running
 environments.
 EOUSAGE
 }
 # arg handling
 opts="$(getopt -o 'ht:c:?' --long 'dry-run,help,test:,config:' -- "$@" || { usage >&2 && false; })"
 eval set -- "$opts"
 declare -A argTests=()
 declare -a configs=()
 dryRun=
 while true; do
 	flag=$1
 	shift
 	case "$flag" in
 		--dry-run) dryRun=1 ;;
 		--help|-h|'-?') usage && exit 0 ;;
 		--test|-t) argTests["$1"]=1 && shift ;;
 		--config|-c) configs+=("$(readlink -f "$1")") && shift ;;
 		--) break ;;
 		*)
 			{
 				echo "error: unknown flag: $flag"
 				usage
 			} >&2
 			exit 1
 			;;
 	esac
 done
 if [ $# -eq 0 ]; then
 	usage >&2
 	exit 1
 fi
 # declare configuration variables
 declare -a globalTests=()
 declare -A testAlias=()
 declare -A imageTests=()
 declare -A globalExcludeTests=()
 declare -A explicitTests=()
 # if there are no user-specified configs, use the default config
 if [ ${#configs} -eq 0 ]; then
 	configs+=("$dir/config.sh")
 fi
 # load the configs
 declare -A testPaths=()
 for conf in "${configs[@]}"; do
 	. "$conf"
 	# Determine the full path to any newly-declared tests
 	confDir="$(dirname "$conf")"
 	for testName in ${globalTests[@]} ${imageTests[@]}; do
 		[ "${testPaths[$testName]}" ] && continue
 		if [ -d "$confDir/tests/$testName" ]; then
 			# Test directory found relative to the conf file
 			testPaths[$testName]="$confDir/tests/$testName"
 		elif [ -d "$dir/tests/$testName" ]; then
 			# Test directory found in the main tests/ directory
 			testPaths[$testName]="$dir/tests/$testName"
 		fi
 	done
 done
 didFail=
 for dockerImage in "$@"; do
 	echo "testing $dockerImage"
 	if ! docker inspect "$dockerImage" &> /dev/null; then
 		echo $'\timage does not exist!'
 		didFail=1
 		continue
 	fi
 	repo="${dockerImage%:*}"
 	tagVar="${dockerImage#*:}"
 	#version="${tagVar%-*}"
 	variant="${tagVar##*-}"
 	testRepo=$repo
 	[ -z "${testAlias[$repo]}" ] || testRepo="${testAlias[$repo]}"
 	explicitVariant=
 	if [ \
 		"${explicitTests[:$variant]}" \
 		-o "${explicitTests[$repo:$variant]}" \
 		-o "${explicitTests[$testRepo:$variant]}" \
 	]; then
 		explicitVariant=1
 	fi
 	testCandidates=()
 	if [ -z "$explicitVariant" ]; then
 		testCandidates+=( "${globalTests[@]}" )
 	fi
 	testCandidates+=(
 		${imageTests[:$variant]}
 	)
 	if [ -z "$explicitVariant" ]; then
 		testCandidates+=(
 			${imageTests[$testRepo]}
 		)
 	fi
 	testCandidates+=(
 		${imageTests[$testRepo:$variant]}
 	)
 	if [ "$testRepo" != "$repo" ]; then
 		if [ -z "$explicitVariant" ]; then
 			testCandidates+=(
 				${imageTests[$repo]}
 			)
 		fi
 		testCandidates+=(
 			${imageTests[$repo:$variant]}
 		)
 	fi
 	tests=()
 	for t in "${testCandidates[@]}"; do
 		if [ ${#argTests[@]} -gt 0 -a -z "${argTests[$t]}" ]; then
 			# skipping due to -t
 			continue
 		fi
 		if [ \
 			! -z "${globalExcludeTests[${testRepo}_$t]}" \
 			-o ! -z "${globalExcludeTests[${testRepo}:${variant}_$t]}" \
 			-o ! -z "${globalExcludeTests[:${variant}_$t]}" \
 			-o ! -z "${globalExcludeTests[${repo}_$t]}" \
 			-o ! -z "${globalExcludeTests[${repo}:${variant}_$t]}" \
 			-o ! -z "${globalExcludeTests[:${variant}_$t]}" \
 		]; then
 			# skipping due to exclude
 			continue
 		fi
 		tests+=( "$t" )
 	done
 	currentTest=0
 	totalTest="${#tests[@]}"
 	for t in "${tests[@]}"; do
 		(( currentTest+=1 ))
 		echo -ne "\t'$t' [$currentTest/$totalTest]..."
 		# run test against dockerImage here
 		# find the script for the test
 		scriptDir="${testPaths[$t]}"
 		if [ -d "$scriptDir" ]; then
 			script="$scriptDir/run.sh"
 			if [ -x "$script" -a ! -d "$script" ]; then
 				# TODO dryRun logic
 				if output="$("$script" $dockerImage)"; then
 					if [ -f "$scriptDir/expected-std-out.txt" ] && ! d="$(echo "$output" | diff -u "$scriptDir/expected-std-out.txt" - 2>/dev/null)"; then
 						echo 'failed; unexpected output:'
 						echo "$d"
 						didFail=1
 					else
 						echo 'passed'
 					fi
 				else
 					echo 'failed'
 					didFail=1
 				fi
 			else
 				echo "skipping"
 				echo >&2 "error: $script missing, not executable or is a directory"
 				didFail=1
 				continue
 			fi
 		else
 			echo "skipping"
 			echo >&2 "error: unable to locate test '$t'"
 			didFail=1
 			continue
 		fi
 	done
 done
 if [ "$didFail" ]; then
 	exit 1
 fi
--- a/test/tests/basic/run.sh
+++ b/test/tests/basic/run.sh
@ -1,62 +0,0 @@
 #!/bin/bash
 set -e
 [ -n "${DEBUG+x}" ] && set -x
 OVPN_DATA=basic-data
 CLIENT=travis-client
 IMG=kylemanna/openvpn
 CLIENT_DIR="$(readlink -f "$(dirname "$BASH_SOURCE")/../../client")"
 ip addr ls
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_genconfig -u udp://$SERV_IP
 # nopass is insecure
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it $IMG easyrsa build-client-full $CLIENT nopass
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_getclient $CLIENT | tee $CLIENT_DIR/config.ovpn
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_listclients | grep $CLIENT
 #
 # Fire up the server
 #
 sudo iptables -N DOCKER || echo 'Firewall already configured'
 sudo iptables -I FORWARD -j DOCKER || echo 'Forward already configured'
 # run in shell bg to get logs
 docker run --name "ovpn-test" -v $OVPN_DATA:/etc/openvpn --rm -p 1194:1194/udp --privileged $IMG &
 #for i in $(seq 10); do
 #    SERV_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}')
 #    test -n "$SERV_IP" && break
 #done
 #sed -ie s:SERV_IP:$SERV_IP:g config.ovpn
 #
 # Fire up a client in a container since openvpn is disallowed by Travis-CI, don't NAT
 # the host as it confuses itself:
 # "Incoming packet rejected from [AF_INET]172.17.42.1:1194[2], expected peer address: [AF_INET]10.240.118.86:1194"
 #
 docker run --rm --net=host --privileged --volume $CLIENT_DIR:/client $IMG /client/wait-for-connect.sh
 #
 # Client either connected or timed out, kill server
 #
 kill %1
 #
 # Celebrate
 #
 cat <<EOF
 ___________
 < it worked >
 -----------
        \   ^__^
         \  (oo)\_______
            (__)\       )\/\\
                ||----w |
                ||     ||
 EOF
--- a/test/tests/client/container.sh
+++ b/test/tests/client/container.sh
@ -1,84 +0,0 @@
 #!/bin/bash
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 SERVER_CONF="/etc/openvpn/openvpn.conf"
 TEST1_OVPN="/etc/openvpn/test1.ovpn"
 # Function to fail
 abort() { cat <<< "$@" 1>&2; exit 1; }
 # Check a config (haystack) for a given line (needle) exit with error if not
 # found.
 test_config() {
    local needle="${2}"
    local file="${1}"
    busybox grep -q "${needle}" "${file}"
    if [ $? -ne 0 ]; then
        abort "==> Config match not found: ${needle}"
    fi
 }
 # Check a config (haystack) for absence of given line (needle) exit with error
 # if found.
 test_not_config() {
    local needle="${2}"
    local file="${1}"
    busybox grep -vq "${needle}" "${file}"
    if [ $? -ne 0 ]; then
        abort "==> Config match found: ${needle}"
    fi
 }
 #
 # Generate openvpn.config file
 #
 ovpn_genconfig \
    -u udp://$SERV_IP \
    -m 1337 \
 EASYRSA_BATCH=1 EASYRSA_REQ_CN="Travis-CI Test CA" ovpn_initpki nopass
 easyrsa build-client-full test1 nopass 2>/dev/null
 ovpn_getclient test1 > "${TEST1_OVPN}"
 #
 # Simple test cases
 #
 # 1. client MTU
 test_config "${TEST1_OVPN}" "^tun-mtu\s\+1337"
 #
 # Test udp client with tcp fallback
 #
 ovpn_genconfig -u udp://$SERV_IP -E "remote $SERV_IP 443 tcp" -E "remote vpn.example.com 443 tcp"
 # nopass is insecure
 EASYRSA_BATCH=1 EASYRSA_REQ_CN="Travis-CI Test CA" ovpn_initpki nopass
 easyrsa build-client-full client-fallback nopass
 ovpn_getclient client-fallback > "${TEST1_OVPN}"
 test_config "${TEST1_OVPN}" "^remote\s\+$SERV_IP\s\+443\s\+tcp"
 test_config "${TEST1_OVPN}" "^remote\s\+vpn.example.com\s\+443\s\+tcp"
 #
 # Test non-defroute config
 #
 ovpn_genconfig -d -u udp://$SERV_IP -r "172.33.33.0/24" -r "172.34.34.0/24"
 # nopass is insecure
 EASYRSA_BATCH=1 EASYRSA_REQ_CN="Travis-CI Test CA" ovpn_initpki nopass
 easyrsa build-client-full non-defroute nopass
 ovpn_getclient non-defroute > "${TEST1_OVPN}"
 # The '!' inverts the match to test that the string isn't present
 test_not_config "${TEST1_OVPN}" "^redirect-gateway\s\+def1"
--- a/test/tests/client/run.sh
+++ b/test/tests/client/run.sh
@ -1 +0,0 @@
 ../run-bash-in-container.sh
--- a/test/tests/conf_options/container.sh
+++ b/test/tests/conf_options/container.sh
@ -1,116 +0,0 @@
 #!/bin/bash
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 SERVER_CONF="/etc/openvpn/openvpn.conf"
 TEST1_OVPN="/etc/openvpn/test1.ovpn"
 # Function to fail
 abort() { cat <<< "$@" 1>&2; exit 1; }
 # Check a config (haystack) for a given line (needle) exit with error if not found.
 test_config() {
    local needle="${2}"
    local file="${1}"
    busybox grep -q "${needle}" "${file}"
    if [ $? -ne 0 ]; then
        abort "==> Config match not found: ${needle}"
    fi
 }
 # Check a config (haystack) for absence of given line (needle) exit with error
 # if found.
 test_not_config() {
    local needle="${2}"
    local file="${1}"
    busybox grep -vq "${needle}" "${file}"
    if [ $? -ne 0 ]; then
        abort "==> Config match found: ${needle}"
    fi
 }
 #
 # Generate openvpn.config file
 #
 read -d '' MULTILINE_EXTRA_SERVER_CONF << EOF
 management localhost 7505
 max-clients 10
 EOF
 ovpn_genconfig \
    -u udp://$SERV_IP \
    -f 1400 \
    -k '60 300' \
    -e "$MULTILINE_EXTRA_SERVER_CONF" \
    -e 'duplicate-cn' \
    -e 'topology subnet' \
    -p 'route 172.22.22.0 255.255.255.0' \
 # Run ovpn_genconfig a second time with no arguments to test its repeatability.
 ovpn_genconfig
 #
 # Simple test cases
 #
 # 1. verb config
 test_config "${SERVER_CONF}" "^verb\s\+3"
 # 2. fragment config
 test_config "${SERVER_CONF}" "^fragment\s\+1400"
 ## Tests for extra configs
 # 3. management config
 test_config "${SERVER_CONF}" "^management\s\+localhost\s\+7505"
 # 4. max-clients config
 test_config "${SERVER_CONF}" "^max-clients\s\+10"
 # 5. duplicate-cn config
 test_config "${SERVER_CONF}" "^duplicate-cn"
 # 6. topology config
 test_config "${SERVER_CONF}" "^topology\s\+subnet"
 ## Tests for push config
 # 7. push route
 test_config "${SERVER_CONF}" '^push\s\+"route\s\+172.22.22.0\s\+255.255.255.0"'
 ## Test for default
 # 8. Should see default route if none provided
 test_config "${SERVER_CONF}" "^route\s\+192.168.254.0\s\+255.255.255.0"
 # 9. Should see a push of 'block-outside-dns' by default
 test_config "${SERVER_CONF}" '^push\s\+"block-outside-dns"'
 # 10. Should see a push of 'dhcp-option DNS' by default
 test_config "${SERVER_CONF}" '^push\s\+"dhcp-option\s\+DNS\s\+8.8.8.8"'
 test_config "${SERVER_CONF}" '^push\s\+"dhcp-option\s\+DNS\s\+8.8.4.4"'
 ## Test for keepalive
 # 11. keepalive config
 test_config "${SERVER_CONF}" '^keepalive\s\+60\s\+300'
 #
 # More elaborate route tests
 #
 ovpn_genconfig -u udp://$SERV_IP -r "172.33.33.0/24" -r "172.34.34.0/24"
 test_config "${SERVER_CONF}" "^route\s\+172.33.33.0\s\+255.255.255.0"
 test_config "${SERVER_CONF}" "^route\s\+172.34.34.0\s\+255.255.255.0"
 #
 # Block outside DNS test
 #
 ovpn_genconfig -u udp://$SERV_IP -b
 test_not_config "${SERVER_CONF}" '^push "block-outside-dns"'
 cat ${SERVER_CONF} >&1
--- a/test/tests/conf_options/run.sh
+++ b/test/tests/conf_options/run.sh
@ -1 +0,0 @@
 ../run-bash-in-container.sh
--- a/test/tests/docker-build.sh
+++ b/test/tests/docker-build.sh
@ -1,39 +0,0 @@
 #!/bin/bash
 set -e
 # wrapper around "docker build" that creates a temporary directory and copies files into it first so that arbitrary host directories can be copied into containers without bind mounts, but accepts a Dockerfile on stdin
 # usage: ./docker-build.sh some-host-directory some-new-image:some-tag <<EOD
 #        FROM ...
 #        COPY dir/... /.../
 #        EOD
 #    ie: ./docker-build.sh .../hylang-hello-world librarytest/hylang <<EOD
 #        FROM hylang
 #        COPY dir/container.hy /dir/
 #        CMD ["hy", "/dir/container.hy"]
 #        EOD
 dir="$1"; shift
 [ -d "$dir" ]
 imageTag="$1"; shift
 tmp="$(mktemp -t -d docker-library-test-build-XXXXXXXXXX)"
 trap "rm -rf '$tmp'" EXIT
 cat > "$tmp/Dockerfile"
 from="$(awk -F '[ \t]+' 'toupper($1) == "FROM" { print $2; exit }' "$tmp/Dockerfile")"
 onbuilds="$(docker inspect -f '{{len .Config.OnBuild}}' "$from")"
 if [ "$onbuilds" -gt 0 ]; then
 	# crap, the image we want to build has some ONBUILD instructions
 	# those are kind of going to ruin our day
 	# let's do some hacks to strip those bad boys out in a new fake layer
 	"$(dirname "$(readlink -f "$BASH_SOURCE")")/remove-onbuild.sh" "$from" "$imageTag"
 	awk -F '[ \t]+' 'toupper($1) == "FROM" { $2 = "'"$imageTag"'" } { print }' "$tmp/Dockerfile" > "$tmp/Dockerfile.new"
 	mv "$tmp/Dockerfile.new" "$tmp/Dockerfile"
 fi
 cp -RL "$dir" "$tmp/dir"
 docker build -t "$imageTag" "$tmp" > /dev/null
--- a/test/tests/dual-proto/run.sh
+++ b/test/tests/dual-proto/run.sh
@ -1,70 +0,0 @@
 #!/bin/bash
 set -e
 [ -n "${DEBUG+x}" ] && set -x
 OVPN_DATA=dual-data
 CLIENT_UDP=travis-client
 CLIENT_TCP=travis-client-tcp
 IMG=kylemanna/openvpn
 CLIENT_DIR="$(readlink -f "$(dirname "$BASH_SOURCE")/../../client")"
 ip addr ls
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 # get temporary TCP config
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_genconfig -u tcp://$SERV_IP:443
 # nopass is insecure
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
 # gen TCP client
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it $IMG easyrsa build-client-full $CLIENT_TCP nopass
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_getclient $CLIENT_TCP | tee $CLIENT_DIR/config-tcp.ovpn
 # switch to UDP config and gen UDP client
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_genconfig -u udp://$SERV_IP
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it $IMG easyrsa build-client-full $CLIENT_UDP nopass
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_getclient $CLIENT_UDP | tee $CLIENT_DIR/config.ovpn
 #Verify client configs
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_listclients | grep $CLIENT_TCP
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_listclients | grep $CLIENT_UDP
 #
 # Fire up the server
 #
 sudo iptables -N DOCKER || echo 'Firewall already configured'
 sudo iptables -I FORWARD -j DOCKER || echo 'Forward already configured'
 # run in shell bg to get logs
 docker run --name "ovpn-test-udp" -v $OVPN_DATA:/etc/openvpn --rm -p 1194:1194/udp --privileged $IMG &
 docker run --name "ovpn-test-tcp" -v $OVPN_DATA:/etc/openvpn --rm -p 443:1194/tcp --privileged $IMG ovpn_run --proto tcp &
 #
 # Fire up a clients in a containers since openvpn is disallowed by Travis-CI, don't NAT
 # the host as it confuses itself:
 # "Incoming packet rejected from [AF_INET]172.17.42.1:1194[2], expected peer address: [AF_INET]10.240.118.86:1194"
 #
 docker run --rm --net=host --privileged --volume $CLIENT_DIR:/client $IMG /client/wait-for-connect.sh
 docker run --rm --net=host --privileged --volume $CLIENT_DIR:/client $IMG /client/wait-for-connect.sh "/client/config-tcp.ovpn"
 #
 # Client either connected or timed out, kill server
 #
 kill %1 %2
 #
 # Celebrate
 #
 cat <<EOF
 ____________               ___________
 < it worked! >             < both ways! >
 ------------               ------------
        \   ^__^        ^__^   /
 	 \  (oo)\______/(oo)  /
 	    (__)\      /(__)
                ||w---w||
                ||     ||
 EOF
--- a/test/tests/image-name.sh
+++ b/test/tests/image-name.sh
@ -1,10 +0,0 @@
 #!/bin/bash
 set -e
 # usage: ./image-name.sh librarytest/something some/image:some-tag
 # output: librarytest/something:some-image-some-tag
 base="$1"; shift
 tag="$1"; shift
 echo "$base:$(echo "$tag" | sed 's![:/]!-!g')"
--- a/test/tests/iptables/run.sh
+++ b/test/tests/iptables/run.sh
@ -1,38 +0,0 @@
 #!/bin/bash
 set -e
 [ -n "${DEBUG+x}" ] && set -x
 OVPN_DATA=basic-data
 IMG="kylemanna/openvpn"
 NAME="ovpn-test"
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 # generate server config including iptables nat-ing
 docker volume create --name $OVPN_DATA
 docker run --rm -v $OVPN_DATA:/etc/openvpn $IMG ovpn_genconfig -u udp://$SERV_IP -N
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
 # Fire up the server
 docker run -d --name $NAME -v $OVPN_DATA:/etc/openvpn --cap-add=NET_ADMIN $IMG
 # check default iptables rules
 docker exec -ti $NAME bash -c 'source /etc/openvpn/ovpn_env.sh; eval iptables -t nat -C POSTROUTING -s $OVPN_SERVER -o eth0 -j MASQUERADE'
 # append new setupIptablesAndRouting function to config
 docker exec -ti $NAME bash -c 'echo function setupIptablesAndRouting { iptables -t nat -A POSTROUTING -m comment --comment "test"\;} >> /etc/openvpn/ovpn_env.sh'
 # kill server in preparation to modify config
 docker kill $NAME
 docker rm $NAME
 # check that overridden function exists and that test iptables rules is active
 docker run -d --name $NAME -v $OVPN_DATA:/etc/openvpn --cap-add=NET_ADMIN $IMG
 docker exec -ti $NAME bash -c 'source /etc/openvpn/ovpn_env.sh; type -t setupIptablesAndRouting && iptables -t nat -C POSTROUTING -m comment --comment "test"'
 #
 # kill server
 #
 docker kill $NAME
 docker rm $NAME
 docker volume rm $OVPN_DATA
--- a/test/tests/otp/run.sh
+++ b/test/tests/otp/run.sh
@ -1,87 +0,0 @@
 #!/bin/bash
 set -e
 [ -n "${DEBUG+x}" ] && set -x
 OVPN_DATA=basic-data-otp
 CLIENT=travis-client
 IMG=kylemanna/openvpn
 OTP_USER=otp
 CLIENT_DIR="$(readlink -f "$(dirname "$BASH_SOURCE")/../../client")"
 # Function to fail
 abort() { cat <<< "$@" 1>&2; exit 1; }
 ip addr ls
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 # Configure server with two factor authentication
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_genconfig -u udp://$SERV_IP -2
 # Ensure reneg-sec 0 in server config when two factor is enabled
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG cat /etc/openvpn/openvpn.conf | grep 'reneg-sec 0' || abort 'reneg-sec not set to 0 in server config'
 # nopass is insecure
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it $IMG easyrsa build-client-full $CLIENT nopass
 # Generate OTP credentials for user named test, should return QR code for test user
 docker run -v $OVPN_DATA:/etc/openvpn --rm -it $IMG ovpn_otp_user $OTP_USER | tee $CLIENT_DIR/qrcode.txt
 # Ensure a chart link is printed in client OTP configuration
 grep 'https://www.google.com/chart' $CLIENT_DIR/qrcode.txt || abort 'Link to chart not generated'
 grep 'Your new secret key is:' $CLIENT_DIR/qrcode.txt || abort 'Secret key is missing'
 # Extract an emergency code from textual output, grepping for line and trimming spaces
 OTP_TOKEN=$(grep -A1 'Your emergency scratch codes are' $CLIENT_DIR/qrcode.txt | tail -1 | tr -d '[[:space:]]')
 # Token should be present
 if [ -z $OTP_TOKEN ]; then
  abort "QR Emergency Code not detected"
 fi
 # Store authentication credentials in config file and tell openvpn to use them
 echo -e "$OTP_USER\n$OTP_TOKEN" > $CLIENT_DIR/credentials.txt
 # Override the auth-user-pass directive to use a credentials file
 docker run -v $OVPN_DATA:/etc/openvpn --rm $IMG ovpn_getclient $CLIENT | sed 's/auth-user-pass/auth-user-pass \/client\/credentials.txt/' | tee $CLIENT_DIR/config.ovpn
 # Ensure reneg-sec 0 in client config when two factor is enabled
 grep 'reneg-sec 0' $CLIENT_DIR/config.ovpn || abort 'reneg-sec not set to 0 in client config'
 #
 # Fire up the server
 #
 sudo iptables -N DOCKER || echo 'Firewall already configured'
 sudo iptables -I FORWARD -j DOCKER || echo 'Forward already configured'
 # run in shell bg to get logs
 docker run --name "ovpn-test" -v $OVPN_DATA:/etc/openvpn --rm -p 1194:1194/udp --privileged $IMG &
 #for i in $(seq 10); do
 #    SERV_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}')
 #    test -n "$SERV_IP" && break
 #done
 #sed -ie s:SERV_IP:$SERV_IP:g $CLIENT_DIR/config.ovpn
 #
 # Fire up a client in a container since openvpn is disallowed by Travis-CI, don't NAT
 # the host as it confuses itself:
 # "Incoming packet rejected from [AF_INET]172.17.42.1:1194[2], expected peer address: [AF_INET]10.240.118.86:1194"
 #
 docker run --rm --net=host --privileged --volume $CLIENT_DIR:/client $IMG /client/wait-for-connect.sh
 #
 # Client either connected or timed out, kill server
 #
 kill %1
 #
 # Celebrate
 #
 cat <<EOF
 ___________
 < it worked >
 -----------
        \   ^__^
         \  (oo)\_______
            (__)\       )\/\\
                ||----w |
                ||     ||
 EOF
--- a/test/tests/paranoid/container.sh
+++ b/test/tests/paranoid/container.sh
@ -1,22 +0,0 @@
 #!/bin/bash
 set -e
 SERV_IP=$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)
 #
 # Generate a simple configuration, returns nonzero on error
 #
 ovpn_genconfig -u udp://$SERV_IP 2>/dev/null
 export EASYRSA_BATCH=1
 export EASYRSA_REQ_CN="Travis-CI Test CA"
 #
 # Initialize the certificate PKI state, returns nonzero on error
 #
 ovpn_initpki nopass 2>/dev/null
 #
 # Test back-up
 #
 ovpn_copy_server_files
--- a/test/tests/paranoid/run.sh
+++ b/test/tests/paranoid/run.sh
@ -1 +0,0 @@
 ../run-bash-in-container.sh
--- a/test/tests/revocation/run.sh
+++ b/test/tests/revocation/run.sh
@ -1,101 +0,0 @@
 #!/bin/bash
 set -e
 [ -n "${DEBUG+x}" ] && set -x
 OVPN_DATA="basic-data"
 CLIENT1="travis-client1"
 CLIENT2="travis-client2"
 IMG="kylemanna/openvpn"
 NAME="ovpn-test"
 CLIENT_DIR="$(readlink -f "$(dirname "$BASH_SOURCE")/../../client")"
 SERV_IP="$(ip -4 -o addr show scope global  | awk '{print $4}' | sed -e 's:/.*::' | head -n1)"
 #
 # Initialize openvpn configuration and pki.
 #
 docker volume create --name $OVPN_DATA
 docker run --rm -v $OVPN_DATA:/etc/openvpn $IMG ovpn_genconfig -u udp://$SERV_IP
 docker run --rm -v $OVPN_DATA:/etc/openvpn -it -e "EASYRSA_BATCH=1" -e "EASYRSA_REQ_CN=Travis-CI Test CA" $IMG ovpn_initpki nopass
 #
 # Fire up the server.
 #
 sudo iptables -N DOCKER || echo 'Firewall already configured'
 sudo iptables -I FORWARD 1 -j DOCKER
 docker run -d -v $OVPN_DATA:/etc/openvpn --cap-add=NET_ADMIN --privileged -p 1194:1194/udp --name $NAME $IMG
 #
 # Test that easy_rsa generate CRLs with 'next publish' set to 3650 days.
 #
 crl_next_update="$(docker exec $NAME openssl crl -nextupdate -noout -in /etc/openvpn/crl.pem | cut -d'=' -f2 | tr -d 'GMT')"
 crl_next_update="$(date -u -d "$crl_next_update" "+%s")"
 now="$(docker exec $NAME date "+%s")"
 crl_remain="$(( $crl_next_update - $now ))"
 crl_remain="$(( $crl_remain / 86400 ))"
 if (( $crl_remain < 3649 )); then
    echo "easy_rsa CRL next publish set to less than 3650 days." >&2
    exit 2
 fi
 #
 # Generate a first client certificate and configuration using $CLIENT1 as CN then revoke it.
 #
 docker exec -it $NAME easyrsa build-client-full $CLIENT1 nopass
 docker exec -it $NAME ovpn_getclient $CLIENT1 > $CLIENT_DIR/config.ovpn
 docker exec -it $NAME bash -c "echo 'yes' | ovpn_revokeclient $CLIENT1 remove"
 #
 # Test that openvpn client can't connect using $CLIENT1 config.
 #
 if docker run --rm -v $CLIENT_DIR:/client --cap-add=NET_ADMIN --privileged --net=host $IMG /client/wait-for-connect.sh; then
    echo "Client was able to connect after revocation test #1." >&2
    exit 2
 fi
 #
 # Generate and revoke a second client certificate using $CLIENT2 as CN, then test for failed client connection.
 #
 docker exec -it $NAME easyrsa build-client-full $CLIENT2 nopass
 docker exec -it $NAME ovpn_getclient $CLIENT2 > $CLIENT_DIR/config.ovpn
 docker exec -it $NAME bash -c "echo 'yes' | ovpn_revokeclient $CLIENT2 remove"
 if docker run --rm -v $CLIENT_DIR:/client --cap-add=NET_ADMIN --privileged --net=host $IMG /client/wait-for-connect.sh; then
    echo "Client was able to connect after revocation test #2." >&2
    exit 2
 fi
 #
 # Restart the server
 #
 docker stop $NAME && docker start $NAME
 #
 # Test for failed connection using $CLIENT2 config again.
 #
 if docker run --rm -v $CLIENT_DIR:/client --cap-add=NET_ADMIN --privileged --net=host $IMG /client/wait-for-connect.sh; then
    echo "Client was able to connect after revocation test #3." >&2
    exit 2
 fi
 #
 # Stop the server and clean up
 #
 docker kill $NAME && docker rm $NAME
 docker volume rm $OVPN_DATA
 sudo iptables -D FORWARD 1
 #
 # Celebrate
 #
 cat <<EOF
 ___________
 < it worked >
 -----------
        \   ^__^
         \  (oo)\_______
            (__)\       )\/\\
                ||----w |
                ||     ||
 EOF
--- a/test/tests/run-bash-in-container.sh
+++ b/test/tests/run-bash-in-container.sh
@ -1,7 +0,0 @@
 #!/bin/bash
 set -e
 testDir="$(readlink -f "$(dirname "$BASH_SOURCE")")"
 runDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 source "$runDir/run-in-container.sh" "$testDir" "$1" bash ./container.sh
--- a/test/tests/run-in-container.sh
+++ b/test/tests/run-in-container.sh
@ -1,46 +0,0 @@
 #!/bin/bash
 set -e
 # NOT INTENDED TO BE USED AS A TEST "run.sh" DIRECTLY
 # SEE OTHER "run-*-in-container.sh" SCRIPTS FOR USAGE
 testDir="$1"
 shift
 image="$1"
 shift
 entrypoint="$1"
 shift
 # do some fancy footwork so that if testDir is /a/b/c, we mount /a/b and use c as the working directory (so relative symlinks work one level up)
 thisDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 testDir="$(readlink -f "$testDir")"
 testBase="$(basename "$testDir")"
 hostMount="$(dirname "$testDir")"
 containerMount="/tmp/test-dir"
 workdir="$containerMount/$testBase"
 # TODO should we be doing something fancy with $BASH_SOURCE instead so we can be arbitrarily deep and mount the top level always?
 newImage="$("$thisDir/image-name.sh" librarytest/run-in-container "$image--$testBase")"
 "$thisDir/docker-build.sh" "$hostMount" "$newImage" <<EOD
 FROM $image
 COPY dir $containerMount
 WORKDIR $workdir
 ENTRYPOINT ["$entrypoint"]
 EOD
 args=( --rm )
 # there is strong potential for nokogiri+overlayfs failure
 # see https://github.com/docker-library/ruby/issues/55
 gemHome="$(docker inspect -f '{{range .Config.Env}}{{println .}}{{end}}' "$newImage" | awk -F '=' '$1 == "GEM_HOME" { print $2; exit }')"
 if [ "$gemHome" ]; then
 	# must be a Ruby image
 	driver="$(docker info | awk -F ': ' '$1 == "Storage Driver" { print $2; exit }')"
 	if [ "$driver" = 'overlay' ]; then
 		# let's add a volume (_not_ a bind mount) on GEM_HOME to work around nokogiri+overlayfs issues
 		args+=( -v "$gemHome" )
 	fi
 fi
 exec docker run "${args[@]}" "$newImage" "$@"
--- a/init/upstart.init
+++ b/init/upstart.init
@ -4,5 +4,5 @@ start on filesystem and started docker
 stop on runlevel [!2345]
 respawn
 script
-  exec docker run -v ovpn-data-example:/etc/openvpn --rm -p 1194:1194/udp --cap-add=NET_ADMIN kylemanna/openvpn
+  exec docker run --volumes-from ovpn-data --rm -p 1194:1194/udp --cap-add=NET_ADMIN kylemanna/openvpn
 end script