From ca47165807c241e4733325c8643d8d8e3aa2d38c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 7 Nov 2018 10:03:49 +0100 Subject: [PATCH] web: move key generation to the main config script --- web/rootfs/etc/cont-init.d/10-config | 9 +++++++++ web/rootfs/etc/cont-init.d/20-keygen | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 web/rootfs/etc/cont-init.d/20-keygen diff --git a/web/rootfs/etc/cont-init.d/10-config b/web/rootfs/etc/cont-init.d/10-config index d6ba8c1..ceeb903 100644 --- a/web/rootfs/etc/cont-init.d/10-config +++ b/web/rootfs/etc/cont-init.d/10-config @@ -7,6 +7,15 @@ mkdir -p \ /var/lib/nginx/tmp/client_body \ /var/tmp/nginx +# generate keys (maybe) +if [[ -f /config/keys/cert.key && -f /config/keys/cert.crt ]]; then + echo "using keys found in /config/keys" +else + echo "generating self-signed keys in /config/keys, you can replace these with your own keys if required" + SUBJECT="/C=US/ST=TX/L=Austin/O=jitsi.org/OU=Jitsi Server/CN=*" + openssl req -new -x509 -days 3650 -nodes -out /config/keys/cert.crt -keyout /config/keys/cert.key -subj "$SUBJECT" +fi + # copy config files if [[ ! -f /config/nginx/nginx.conf ]]; then cp /defaults/nginx.conf /config/nginx/nginx.conf diff --git a/web/rootfs/etc/cont-init.d/20-keygen b/web/rootfs/etc/cont-init.d/20-keygen deleted file mode 100644 index f63c30e..0000000 --- a/web/rootfs/etc/cont-init.d/20-keygen +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [[ -f /config/keys/cert.key && -f /config/keys/cert.crt ]]; then - echo "using keys found in /config/keys" -else - echo "generating self-signed keys in /config/keys, you can replace these with your own keys if required" - SUBJECT="/C=US/ST=TX/L=Austin/O=jitsi.org/OU=Jitsi Server/CN=*" - openssl req -new -x509 -days 3650 -nodes -out /config/keys/cert.crt -keyout /config/keys/cert.key -subj "$SUBJECT" -fi -