Commit 788b1540 authored by Girish Ramakrishnan's avatar Girish Ramakrishnan

Rename the easyrsa-config to easyrsa-vars

parent 7b549dff
......@@ -12,6 +12,7 @@ RUN apt-get update -y && apt-get install -y openvpn=2.4.4-2ubuntu1.3 easy-rsa ip
RUN make-cadir /app/code/easyrsa
RUN chmod +rx /app/code/easyrsa
RUN sed -e 's,^RANDFILE\s*= \$ENV::HOME/\.rnd$,RANDFILE = /tmp/.rnd,' -i /app/code/easyrsa/openssl-1.0.0.cnf
ADD easyrsa-vars.sh /app/code/easyrsa/
# Workaround quantum permissions bug
RUN chown -R cloudron:cloudron /app/code/easyrsa
......@@ -20,7 +21,7 @@ ADD package.json package-lock.json /app/code/
ADD src /app/code/src
ADD frontend /app/code/frontend
ADD hooks /app/code/hooks
ADD start.sh server.js openvpn-conf.sh easyrsa-config.sh regen-crl.sh /app/code/
ADD start.sh server.js openvpn-conf.sh regen-crl.sh /app/code/
# Somehow postinstall is not run automatically when building docker image
RUN npm install --production && npm run postinstall
......
#!/usr/bin/env bash
source ./easyrsa-config.sh
source /app/code/easyrsa/easyrsa-vars.sh
KEY_ALTNAMES="" KEY_CN="" ${OPENSSL} ca -gencrl -out /app/data/keys/crl.pem -config "$KEY_CONFIG"
......@@ -12,7 +12,7 @@ fi
# Generate random management token for admin api
dd if=/dev/urandom bs=256 count=1 | base64 > /run/admin-token
source ./easyrsa-config.sh
source /app/code/easyrsa/easyrsa-vars.sh
# The first time this is run, initialize OpenVPN keys
if [ ! -d /app/data/keys ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment