nextcloud-domain: fix variable collision

Signed-off-by: nachoparker <[email protected]>
nextcloud · Oct 25, 2021 · b1e7323 · b1e7323
1 parent 9ff21bb
commit b1e7323
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/bin/nextcloud-domain.sh b/bin/nextcloud-domain.sh
@@ -4,16 +4,16 @@ source /usr/local/etc/library.sh
 
 # wicd service finishes before completing DHCP
 while :; do
-  ip="$(get_ip)"
+  local_ip="$(get_ip)"
   public_ip="$(curl -m4 icanhazip.com 2>/dev/null)"
 
   [[ "$public_ip" != "" ]] && ncc config:system:set trusted_domains 11 --value="$public_ip"
-  [[ "$ip" != "" ]] && break
+  [[ "$local_ip" != "" ]] && break
 
   sleep 3
 done
 
-ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[ip]}"       --value="${ip}"
+ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[ip]}"       --value="${local_ip}"
 ncc config:system:set trusted_domains "${TRUSTED_DOMAINS[hostname]}" --value="$(hostname -f)"
 
 # we might need to retry if redis is not ready

diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,9 @@
 
-[v1.42.2](https://github.com/nextcloud/nextcloudpi/commit/749d252) (2021-10-23) nc-backup-auto: ncc path
+[v1.42.3](https://github.com/nextcloud/nextcloudpi/commit/2d804cb) (2021-10-25) nextcloud-domain: fix variable collision
 
-[v1.42.1](https://github.com/nextcloud/nextcloudpi/commit/e11ce59) (2021-10-22) ncp-web: fix log download bug
+[v1.42.2](https://github.com/nextcloud/nextcloudpi/commit/9ff21bb) (2021-10-23) nc-backup-auto: ncc path
+
+[v1.42.1 ](https://github.com/nextcloud/nextcloudpi/commit/e11ce59) (2021-10-22) ncp-web: fix log download bug
 
 [v1.42.0 ](https://github.com/nextcloud/nextcloudpi/commit/3f57513) (2021-10-21) ncp-web: add Russion translations