library.sh: Remove invalid trusted_proxy

Signed-off-by: Tobias Knöppler <[email protected]>

Author: theCalcaholic

.github/workflows/build-lxd.yml

@@ -327,7 +327,6 @@ jobs:
     runs-on: [ubuntu-20.04]
     env:
       VERSION: "${{ inputs.git_ref || github.ref }}"
-      ARTIFACT_NAME: "${{ needs.build-previous.outputs.artifact_name }}"
       LXC: "${{ needs.determine-runner.outputs.lxc_cmd }}"
       PREVIOUS_IMAGE_URL: "https://github.com/nextcloud/nextcloudpi/releases/download/v1.53.2/NextcloudPi_LXD_x86_v1.53.2.tar.gz"
     steps:

etc/library.sh

@@ -156,7 +156,7 @@ function set-nc-domain()
   if is_ncp_activated && is_app_enabled notify_push; then
     ncc config:system:set trusted_proxies 11 --value="127.0.0.1"
     ncc config:system:set trusted_proxies 12 --value="::1"
-    ncc config:system:set trusted_proxies 13 --value="${domain}"
+#    ncc config:system:set trusted_proxies 13 --value="${domain}"
     ncc config:system:set trusted_proxies 14 --value="$(dig +short "${domain}")"
     sleep 5 # this seems to be required in the VM for some reason. We get `http2 error: protocol error` after ncp-upgrade-nc
     for try in {1..5}

updates/1.54.0.sh

@@ -7,5 +7,11 @@ then
   sed -i -e 's/^PermitRootLogin.*$/PermitRootLogin No/' /etc/ssh/sshd_config
 fi
 
+for i in {10..15}
+do
+  proxy="$(ncc config:system:get trusted_proxies "$i")"
+  [[ -z "$proxy" ]] || python3 -c "import ipaddress; ipaddress.ip_address('${proxy}')" || ncc config:system:delete trusted_proxies "$i"
+done
+
 apt-get update
 apt-get install --no-install-recommends -y tmux