add script for trusted domains (#2482)

lets-encrypt/test-new-config.sh

@@ -34,11 +34,9 @@ then
     sed -i "s|env\[HOSTNAME\] = .*|env[HOSTNAME] = $(hostname -f)|g" "$PHP_POOL_DIR"/nextcloud.conf
 fi
 
-# Set trusted domains
-nextcloud_occ config:system:set trusted_domains 0 --value="localhost"
-nextcloud_occ config:system:set trusted_domains 1 --value="$ADDRESS"
-nextcloud_occ config:system:set trusted_domains 2 --value="$(hostname -f)"
-nextcloud_occ config:system:set overwrite.cli.url --value="https://$(hostname --fqdn)"
+# Set the domain as trusted
+add_to_trusted_domains "$1"
+nextcloud_occ config:system:set overwrite.cli.url --value="https://$1"
 nextcloud_occ maintenance:update:htaccess
 
 # Add crontab

nextcloud-startup-script.sh

@@ -554,11 +554,7 @@ mesg n
 ROOTNEWPROFILE
 
 # Set trusted domains
-nextcloud_occ config:system:set trusted_domains 0 --value="localhost"
-nextcloud_occ config:system:set trusted_domains 1 --value="$ADDRESS"
-nextcloud_occ config:system:set trusted_domains 2 --value="$(hostname -f)"
-nextcloud_occ config:system:set overwrite.cli.url --value="https://$(hostname --fqdn)"
-nextcloud_occ maintenance:update:htaccess
+run_script STATIC trusted_domains
 
 # Upgrade system
 print_text_in_color "$ICyan" "System will now upgrade..."

static/trusted_domains.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+true
+SCRIPT_NAME="Set trusted domain"
+# shellcheck source=lib.sh
+source /var/scripts/fetch_lib.sh
+
+# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
+
+# Check for errors + debug code and abort if something isn't right
+# 1 = ON
+# 0 = OFF
+DEBUG=0
+debug_mode
+
+# Set trusted domains default
+if [ -n "$ADDRESS" ]
+then
+    nextcloud_occ config:system:set trusted_domains 0 --value="localhost"
+    nextcloud_occ config:system:set trusted_domains 1 --value="$ADDRESS"
+    nextcloud_occ config:system:set trusted_domains 2 --value="$(hostname)"
+    nextcloud_occ config:system:set overwrite.cli.url --value="https://$(hostname --fqdn)"
+    # Also set WAN address if it exists
+    if [ -n "$WANIP4" ]
+    then
+        nextcloud_occ config:system:set trusted_domains 3 --value="$WANIP4"
+    fi
+else
+    nextcloud_occ config:system:set trusted_domains 0 --value="localhost"
+    nextcloud_occ config:system:set trusted_domains 1 --value="$(hostname)"
+    nextcloud_occ config:system:set overwrite.cli.url --value="https://$(hostname --fqdn)"
+    # Also set WAN address if it exists
+    if [ -n "$WANIP4" ]
+    then
+        nextcloud_occ config:system:set trusted_domains 2 --value="$WANIP4"
+    fi
+fi