letsencrypt: fix invalid arithmetic operator errorv1.44.7

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

5 files changed, 11 insertions, 11 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"
 }