From f0e705bd1490ca31a82ede88eca896a846c1b6bb Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Tue, 21 Sep 2021 20:24:33 +0200
Subject: [PATCH] Update and rename 30-keygen to 30-certs_keygen

---
 .../root/etc/cont-init.d/30-certs_keygen      | 28 +++++++++++++++++++
 nextcloud/root/etc/cont-init.d/30-keygen      | 10 -------
 2 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 nextcloud/root/etc/cont-init.d/30-certs_keygen
 delete mode 100644 nextcloud/root/etc/cont-init.d/30-keygen

diff --git a/nextcloud/root/etc/cont-init.d/30-certs_keygen b/nextcloud/root/etc/cont-init.d/30-certs_keygen
new file mode 100644
index 000000000..6e089304f
--- /dev/null
+++ b/nextcloud/root/etc/cont-init.d/30-certs_keygen
@@ -0,0 +1,28 @@
+#!/usr/bin/with-contenv bashio
+/defaults/nextcloud-perms.sh
+
+   #Check if files exist
+if bashio::config.has_value 'certfile'; then
+   bashio::log.info "Using referenced ssl certificates..."
+   CERTFILE=$(bashio::config 'certfile')
+   KEYFILE=$(bashio::config 'keyfile')
+
+   #Check if files exist
+   [ ! -f /ssl/$CERTFILE ] && bashio::log.fatal "Certificate /ssl/$CERTFILE not found" && exit 1
+   [ ! -f /ssl/$KEYFILE ] && bashio::log.fatal "Certificate /ssl/$KEYFILE not found" && exit 1
+
+   #Sets certificates
+   sed -i "s|nextcloud/keys/cert.crt|$CERTFILE|g" /defaults/default
+   sed -i "s|nextcloud/keys/cert.key|$KEYFILE|g" /defaults/default
+else
+   bashio::log.info "No ssl certificates set. Auto generating ones."
+   SUBJECT="/C=US/ST=CA/L=Carlsbad/O=Linuxserver.io/OU=LSIO Server/CN=*"
+   if [[ -f /ssl/nextcloud/keys/cert.key && -f /ssl/nextcloud/keys/cert.crt ]]; then
+     bashio::log.info "using keys found in /ssl/nextcloud/keys"
+   else
+     bashio::log.info "generating self-signed keys in /ssl/nextcloud/keys, you can replace these with your own keys if required"
+     openssl req -new -x509 -days 3650 -nodes -out /ssl/nextcloud/keys/cert.crt -keyout /ssl/nextcloud/keys/cert.key -subj "$SUBJECT"
+   fi
+fi
+
+
diff --git a/nextcloud/root/etc/cont-init.d/30-keygen b/nextcloud/root/etc/cont-init.d/30-keygen
deleted file mode 100644
index 10e648398..000000000
--- a/nextcloud/root/etc/cont-init.d/30-keygen
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-/defaults/nextcloud-perms.sh
-SUBJECT="/C=US/ST=CA/L=Carlsbad/O=Linuxserver.io/OU=LSIO Server/CN=*"
-if [[ -f /ssl/nextcloud/keys/cert.key && -f /ssl/nextcloud/keys/cert.crt ]]; then
-echo "using keys found in /ssl/nextcloud/keys"
-else
-echo "generating self-signed keys in /ssl/nextcloud/keys, you can replace these with your own keys if required"
-openssl req -new -x509 -days 3650 -nodes -out /ssl/nextcloud/keys/cert.crt -keyout /ssl/nextcloud/keys/cert.key -subj "$SUBJECT"
-fi
-