Trusted domains

lets-encrypt/test-new-config.sh

@@ -35,7 +35,11 @@ then
 fi
 
 # Set trusted domains
-run_script NETWORK trusted
+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
 
 # Add crontab
 cat << CRONTAB > "$SCRIPTS/letsencryptrenew.sh"

network/trusted.sh

@@ -1,28 +1,14 @@
 #!/bin/bash
-
-# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
-
 true
-SCRIPT_NAME="Trusted"
+SCRIPT_NAME="Set trusted domain"
 # shellcheck source=lib.sh
-source /var/scripts/fetch_lib.sh
-
-# Check for errors + debug code and abort if something isn't right
-# 1 = ON
-# 0 = OFF
-DEBUG=0
-debug_mode
-
-download_script NETWORK update-config
-if [ -f $SCRIPTS/update-config.php ]
-then
-    # Change config.php
-    php $SCRIPTS/update-config.php $NCPATH/config/config.php 'trusted_domains[]' localhost "${ADDRESS[@]}" "$(hostname)" "$(hostname --fqdn)" >/dev/null 2>&1
-    php $SCRIPTS/update-config.php $NCPATH/config/config.php overwrite.cli.url https://"$(hostname --fqdn)"/ >/dev/null 2>&1
+source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
-    # Change .htaccess accordingly
-    sed -i "s|RewriteBase /nextcloud|RewriteBase /|g" $NCPATH/.htaccess
+# Removed in NC 26.0.0.
 
-    # Cleanup
-    rm -f $SCRIPTS/update-config.php
-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)"
+nextcloud_occ maintenance:update:htaccess

nextcloud-startup-script.sh

@@ -554,7 +554,12 @@ mesg n
 ROOTNEWPROFILE
 
 # Set trusted domain in config.php
-run_script NETWORK trusted
+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 trusted_domains 3 --value="$(hostname --fqdn)"
+nextcloud occ config:system:set overwrite.cli.url --value="https://$(hostname --fqdn)"
+nextcloud_occ maintenance:update:htaccess
 
 # Upgrade system
 print_text_in_color "$ICyan" "System will now upgrade..."