Skip to content

Commit

Permalink
add public IP to trusted domains
Browse files Browse the repository at this point in the history
  • Loading branch information
nachoparker committed Jan 17, 2019
1 parent bab2d22 commit 1f11d40
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 5 deletions.
13 changes: 8 additions & 5 deletions ncp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,16 @@ EOF
#!/bin/bash
# wicd service finishes before completing DHCP
while :; do
IFACE="$( ip r | grep "default via" | awk '{ print $5 }' | head -1 )"
IP="$( ip a show dev "$IFACE" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )"
[[ "$IP" != "" ]] && break
iface="$( ip r | grep "default via" | awk '{ print $5 }' | head -1 )"
ip="$( ip a show dev "$iface" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )"
public_ip="$(curl icanhazip.com 2>/dev/null)"
[[ "$public_ip" != "" ]] && ncc config:system:set trusted_domains 11 --value="$public_ip"
[[ "$ip" != "" ]] && break
sleep 3
done
cd /var/www/nextcloud
sudo -u www-data php occ config:system:set trusted_domains 1 --value=$IP
ncc config:system:set trusted_domains 1 --value=$ip
EOF

[[ "$DOCKERBUILD" != 1 ]] && systemctl enable nextcloud-domain
Expand Down
17 changes: 17 additions & 0 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,23 @@ EOF
install_app nc-backup
install_app nc-restore

# add public IP to trusted domains
cat > /usr/local/bin/nextcloud-domain.sh <<'EOF'
#!/bin/bash
# wicd service finishes before completing DHCP
while :; do
iface="$( ip r | grep "default via" | awk '{ print $5 }' | head -1 )"
ip="$( ip a show dev "$iface" | grep global | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )"
public_ip="$(curl icanhazip.com 2>/dev/null)"
[[ "$public_ip" != "" ]] && ncc config:system:set trusted_domains 11 --value="$public_ip"
[[ "$ip" != "" ]] && break
sleep 3
done
ncc config:system:set trusted_domains 1 --value=$ip
EOF

# remove redundant opcache configuration. Leave until update bug is fixed -> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815968
# Bug #416 reappeared after we moved to php7.2 and debian buster packages. (keep last)
[[ "$( ls -l /etc/php/7.2/fpm/conf.d/*-opcache.ini | wc -l )" -gt 1 ]] && rm "$( ls /etc/php/7.2/fpm/conf.d/*-opcache.ini | tail -1 )"
Expand Down

0 comments on commit 1f11d40

Please sign in to comment.