diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-10-25 19:44:58 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-10-25 19:45:02 +0300 |
| commit | b1e73237dad0f3e5ddd628154e51cb820c4f7891 (patch) | |
| tree | d5ac1089aefb8d71ac5f6912a6ca66315e9ba944 | |
| parent | 9ff21bb3fb365738da7c4adeddd9dd02e2039939 (diff) | |
nextcloud-domain: fix variable collisionv1.42.3
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/nextcloud-domain.sh | 6 | ||||
| -rw-r--r-- | changelog.md | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/bin/nextcloud-domain.sh b/bin/nextcloud-domain.sh index 3267ed0c..69c76bc3 100644 --- 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 index bb58c950..a230b03d 100644 --- 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 |