letsencrypt: fix invalid arithmetic operator errorv1.44.7

Signed-off-by: nachoparker <nacho@ownyourbits.com>

10 files changed, 31 insertions, 27 deletions

diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh
index eb08a241..9487dc85 100644
--- a/bin/ncp/CONFIG/nc-init.sh
+++ b/bin/ncp/CONFIG/nc-init.sh
@@ -105,10 +105,10 @@ EOF
   # 4 Byte UTF8 support
   ncc config:system:set mysql.utf8mb4 --type boolean --value="true"
 
-  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi]}"       --value="nextcloudpi"
-  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi-local]}" --value="nextcloudpi.local"
-  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nextcloudpi-lan]}"   --value="nextcloudpi.lan"
-  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nc_domain]}"         --value="nextcloudpi.lan"
+  ncc config:system:set trusted_domains 7 --value="nextcloudpi"
+  ncc config:system:set trusted_domains 5 --value="nextcloudpi.local"
+  ncc config:system:set trusted_domains 8 --value="nextcloudpi.lan"
+  ncc config:system:set trusted_domains 3 --value="nextcloudpi.lan"
 
   # email
   ncc config:system:set mail_smtpmode     --value="sendmail"
diff --git a/bin/ncp/CONFIG/nc-trusted-domains.sh b/bin/ncp/CONFIG/nc-trusted-domains.sh
index 2f271d93..8b602712 100644
--- a/bin/ncp/CONFIG/nc-trusted-domains.sh
+++ b/bin/ncp/CONFIG/nc-trusted-domains.sh
@@ -10,9 +10,9 @@
 
 configure()
 {
-  [[ "$DOMAIN1" != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[trusted_domain_1]}" --value="$DOMAIN1"
-  [[ "$DOMAIN2" != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[trusted_domain_2]}" --value="$DOMAIN2"
-  [[ "$DOMAIN3" != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[trusted_domain_3]}" --value="$DOMAIN3"
+  [[ "$DOMAIN1" != "" ]] && ncc config:system:set trusted_domains 20 --value="$DOMAIN1"
+  [[ "$DOMAIN2" != "" ]] && ncc config:system:set trusted_domains 21 --value="$DOMAIN2"
+  [[ "$DOMAIN3" != "" ]] && ncc config:system:set trusted_domains 22 --value="$DOMAIN3"
 }
 
 install(){ :; }
diff --git a/bin/ncp/NETWORKING/dnsmasq.sh b/bin/ncp/NETWORKING/dnsmasq.sh
index 07fb5d2a..587dc4e3 100644
--- a/bin/ncp/NETWORKING/dnsmasq.sh
+++ b/bin/ncp/NETWORKING/dnsmasq.sh
@@ -50,7 +50,7 @@ configure()
 
   local IFACE IP
   IFACE=$( ip r | grep "default via"   | awk '{ print $5 }' | head -1 )
-  IP=$( ncc config:system:get trusted_domains "${TRUSTED_DOMAINS[docker_overwrite]}" | grep -oP '\d{1,3}(.\d{1,3}){3}' )
+  IP=$( ncc config:system:get trusted_domains 6 | grep -oP '\d{1,3}(.\d{1,3}){3}' )
   [[ "$IP" == "" ]] && IP="$(get_ip)"
 
   [[ "$IP" == "" ]] && { echo "could not detect IP"; return 1; }
@@ -74,7 +74,7 @@ EOF
   update-rc.d dnsmasq defaults
   update-rc.d dnsmasq enable
   service dnsmasq restart
-  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[dnsmasq]}" --value="$DOMAIN"
+  ncc config:system:set trusted_domains 2 --value="$DOMAIN"
   set-nc-domain "$DOMAIN" --no-trusted-domain
   echo "dnsmasq enabled"
 }
diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh
index a7278884..0dfc9394 100644
--- a/bin/ncp/NETWORKING/letsencrypt.sh
+++ b/bin/ncp/NETWORKING/letsencrypt.sh
@@ -121,7 +121,7 @@ EOF
     sed -i "s|SSLCertificateKeyFile.*|SSLCertificateKeyFile ${key_path}|" "${ncp_vhostcfg}"
 
     # Configure Nextcloud
-    local domain_index="${TRUSTED_DOMAINS[letsencrypt_1]}"
+    local domain_index=11
     for dom in $DOMAIN "${OTHER_DOMAINS_ARRAY[@]}"; do
       [[ "$dom" != "" ]] && {
         [[ $domain_index -lt 20 ]] || {
diff --git a/bin/ncp/NETWORKING/nc-static-IP.sh b/bin/ncp/NETWORKING/nc-static-IP.sh
index 36c18412..9b3988f6 100644
--- a/bin/ncp/NETWORKING/nc-static-IP.sh
+++ b/bin/ncp/NETWORKING/nc-static-IP.sh
@@ -89,7 +89,7 @@ EOF
     ifup "${IFACE}"
   }
  
-  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[ip]}" --value="$IP"
+  ncc config:system:set trusted_domains 1 --value="$IP"
   set-nc-domain "${IP}"
   echo "Static IP set to $IP"
 }
diff --git a/bin/nextcloud-domain.sh b/bin/nextcloud-domain.sh
index ff50c1b5..95eb0963 100644
--- a/bin/nextcloud-domain.sh
+++ b/bin/nextcloud-domain.sh
@@ -13,14 +13,14 @@ while :; do
   local_ip="$(get_ip)"
   pub_ip="$(curl -m4 icanhazip.com 2>/dev/null)"
 
-  [[ "$pub_ip"   != "" ]] && ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[public_ip]}" --value="$pub_ip"
+  [[ "$pub_ip"   != "" ]] && ncc config:system:set trusted_domains 11 --value="$pub_ip"
   [[ "$local_ip" != "" ]] && break
 
   sleep 3
 done
 
-ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[ip]}"       --value="${local_ip}"
-ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[hostname]}" --value="$(hostname -f)"
+ncc config:system:set trusted_domains 1  --value="${local_ip}"
+ncc config:system:set trusted_domains 14 --value="$(hostname -f)"
 
 # we might need to retry if redis is not ready
 while :; do
diff --git a/build/build-SD-rpi.sh b/build/build-SD-rpi.sh
index a9f2b18b..25d6204a 100755
--- a/build/build-SD-rpi.sh
+++ b/build/build-SD-rpi.sh
@@ -13,7 +13,7 @@ source build/buildlib.sh
 
 echo -e "\e[1m\n[ Build NCP Raspberry Pi ]\e[0m"
 
-URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2020-08-24/2020-08-20-raspios-buster-arm64-lite.zip"
+URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2021-11-08/2021-10-30-raspios-bullseye-arm64-lite.zip"
 SIZE=4G                     # Raspbian image size
 #CLEAN=0                    # Pass this envvar to skip cleaning download cache
 IMG="NextCloudPi_RPi_$( date  "+%m-%d-%y" ).img"
diff --git a/build/docker/nextcloud/020nextcloud b/build/docker/nextcloud/020nextcloud
index 257818ef..e2ff13c6 100755
--- a/build/docker/nextcloud/020nextcloud
+++ b/build/docker/nextcloud/020nextcloud
@@ -72,7 +72,7 @@ bash /usr/local/bin/nextcloud-domain.sh
 
 # Trusted Domain (as an argument)
 [[ "$2" != "" ]] && \
-  ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[docker_overwrite]}" --value="$2"
+  ncc config:system:set trusted_domains 6 --value="$2"
 
 echo "Nextcloud version $(nc_version). NextCloudPi version $(cat /usr/local/etc/ncp-version)"
 
diff --git a/changelog.md b/changelog.md
index 126ade88..4e696d20 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,9 +1,13 @@
 
-[v1.44.5](https://github.com/nextcloud/nextcloudpi/commit/0e15dc9) (2021-11-29) ncp-previewgenerator: fix app enable in NC22
+[v1.46.7](https://github.com/nextcloud/nextcloudpi/commit/0da8dcd) (2021-12-13) letsencrypt: fix invalid arithmetic operator error
 
-[v1.44.4](https://github.com/nextcloud/nextcloudpi/commit/0a4f8c1) (2021-11-19) ncp-web: fix spurious characters in power menu
+[v1.44.6 ](https://github.com/nextcloud/nextcloudpi/commit/26a7778) (2021-12-06) notify_push: fix service not restarting on binary update (#1398)
 
-[v1.44.3](https://github.com/nextcloud/nextcloudpi/commit/4717eb3) (2021-11-18) tweak ncc command
+[v1.44.5](https://github.com/nextcloud/nextcloudpi/commit/5a404c0) (2021-11-29) ncp-previewgenerator: fix app enable in NC22
+
+[v1.44.4 ](https://github.com/nextcloud/nextcloudpi/commit/0a4f8c1) (2021-11-19) ncp-web: fix spurious characters in power menu
+
+[v1.44.3 ](https://github.com/nextcloud/nextcloudpi/commit/4717eb3) (2021-11-18) tweak ncc command
 
 [v1.44.2 ](https://github.com/nextcloud/nextcloudpi/commit/0c589ff) (2021-11-16) ncp-app: bump to NC22
 
diff --git a/etc/library.sh b/etc/library.sh
index 7be0fb2c..35787806 100644
--- a/etc/library.sh
+++ b/etc/library.sh
@@ -14,13 +14,13 @@ export BINDIR=/usr/local/bin/ncp
 export NCDIR=/var/www/nextcloud
 export ncc=/usr/local/bin/ncc
 
-unset TRUSTED_DOMAINS
-declare -A TRUSTED_DOMAINS
-export TRUSTED_DOMAINS=(
-  [ip]=1 [dnsmasq]=2 [nc_domain]=3 [nextcloudpi-local]=5 [docker_overwrite]=6
-  [nextcloudpi]=7 [nextcloudpi-lan]=8 [public_ip]=11 [letsencrypt_1]=12
-  [letsencrypt_2]=13 [hostname]=14 [trusted_domain_1]=20 [trusted_domain_2]=21 [trusted_domain_3]=22
-)
+#unset TRUSTED_DOMAINS
+#declare -A TRUSTED_DOMAINS
+#export TRUSTED_DOMAINS=(
+  #[ip]=1 [dnsmasq]=2 [nc_domain]=3 [nextcloudpi-local]=5 [docker_overwrite]=6
+  #[nextcloudpi]=7 [nextcloudpi-lan]=8 [public_ip]=11 [letsencrypt_1]=12
+  #[letsencrypt_2]=13 [hostname]=14 [trusted_domain_1]=20 [trusted_domain_2]=21 [trusted_domain_3]=22
+#)
 
 command -v jq &>/dev/null || {
   apt-get update
@@ -127,7 +127,7 @@ function set-nc-domain()
   proto="$(ncc config:system:get overwriteprotocol)" || true
   [[ "${proto}" == "" ]] && proto="https"
   local url="${proto}://${domain%*/}"
-  [[ "$2" == "--no-trusted-domain" ]] || ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[nc-domain]}" --value="${domain%*/}"
+  [[ "$2" == "--no-trusted-domain" ]] || ncc config:system:set trusted_domains 3 --value="${domain%*/}"
   ncc config:system:set overwrite.cli.url --value="${url}/"
   if is_ncp_activated && is_app_enabled notify_push; then
     ncc config:system:set trusted_proxies 11 --value="127.0.0.1"