From 2b09fa1ac17f98893ed494ee50813a3b2fcb2877 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Fri, 22 Jan 2021 19:21:41 +0100
Subject: [PATCH] Sync with /ssl folder

---
 nextcloud/root/etc/cont-init.d/30-keygen | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nextcloud/root/etc/cont-init.d/30-keygen b/nextcloud/root/etc/cont-init.d/30-keygen
index e7d89d8d1..463aae896 100644
--- a/nextcloud/root/etc/cont-init.d/30-keygen
+++ b/nextcloud/root/etc/cont-init.d/30-keygen
@@ -2,9 +2,7 @@
 /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"
-elif [[ -f /ssl/privkey.pem && -f /ssl/fullchain.pem ]]; then
+if [[ -f /ssl/privkey.pem && -f /ssl/fullchain.pem ]]; then
 echo "using pem keys found in /ssl"
 cp /ssl/privkey.pem /ssl/nextcloud/keys/cert.key
 cp /ssl/fullchain.pem /ssl/nextcloud/keys/cert.crt
@@ -13,6 +11,8 @@ elif [[ -f /ssl/cert.key && -f /ssl/cert.crt ]]; then
 echo "using crt keys found in /ssl"
 cp /ssl/cert.key /ssl/nextcloud/keys/cert.key
 cp /ssl/cert.crt /ssl/nextcloud/keys/cert.crt
+elif [[ -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"