Skip to content

Commit 6ad9310

Browse files
author
Kyle Manna
committed
easy-rsa: Drop all mention of the vars file
* This exists to import/export a number of easy-rsa default values but creates headaches for old volumes due to changes where easy-rsa insists on loading the var file if the environment variable is set. * Going forward people should pass the variables via: `docker run -e EASYRSA_var ...` * Closes #608
1 parent c4b9436 commit 6ad9310

File tree

4 files changed

+1
-46
lines changed

4 files changed

+1
-46
lines changed

Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/reposi
1515
ENV OPENVPN=/etc/openvpn
1616
ENV EASYRSA=/usr/share/easy-rsa \
1717
EASYRSA_CRL_DAYS=3650 \
18-
EASYRSA_PKI=$OPENVPN/pki \
19-
EASYRSA_VARS_FILE=$OPENVPN/vars
18+
EASYRSA_PKI=$OPENVPN/pki
2019

2120
VOLUME ["/etc/openvpn"]
2221

Dockerfile.aarch64

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community/" >> /etc/apk/reposi
1515
ENV OPENVPN /etc/openvpn
1616
ENV EASYRSA /usr/share/easy-rsa
1717
ENV EASYRSA_PKI $OPENVPN/pki
18-
ENV EASYRSA_VARS_FILE $OPENVPN/vars
1918

2019
# Prevents refused client connection because of an expired CRL
2120
ENV EASYRSA_CRL_DAYS 3650

bin/easyrsa_vars

-39
This file was deleted.

bin/ovpn_initpki

-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ source "$OPENVPN/ovpn_env.sh"
1515
# Specify "nopass" as arg[2] to make the CA insecure (not recommended!)
1616
nopass=$1
1717

18-
# EasyRSA 3.0.7 introduced checks for $EASYRSA_VARS_FILE existence
19-
# in the init-pki script
20-
touch $EASYRSA_VARS_FILE
21-
2218
# Provides a sufficient warning before erasing pre-existing files
2319
easyrsa init-pki
2420

0 commit comments

Comments
 (0)