Merge remote-tracking branch 'dweismueller/owncloud-7' into next

[ipfire-2.x.git] / config / rootfiles / core / 80 / update.sh

diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh
index 830481d0eaa14275eeba26325872c2aa01d5d0cd..67244c654cc9e689850d27f752af00a81bf2972b 100644 (file)
--- a/config/rootfiles/core/80/update.sh
+++ b/config/rootfiles/core/80/update.sh
@@ -31,19 +31,26 @@ do
        rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+# Stop services
+/etc/init.d/ipsec stop
+
 # Remove old strongswan files
 rm -f \
        /etc/strongswan.d/charon/unity.conf \
        /usr/lib/ipsec/plugins/libstrongswan-unity.so \
        /usr/share/strongswan/templates/config/plugins/unity.conf
 
-# Stop services
+rm -f /usr/local/bin/setddns.pl
 
 # Extract files
 extract_files
 
 # Start services
 /etc/init.d/dnsmasq restart
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       /etc/init.d/ipsec start
+fi
+
 
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
@@ -53,14 +60,20 @@ rm -f \
        /opt/pakfire/db/installed/meta-libgpg-error \
        /opt/pakfire/db/rootfiles/libgpg-error
 
+# Fix broken proxy configuration permissions
+chown -R nobody.nobody \
+       /var/ipfire/proxy/advanced \
+       /var/ipfire/proxy/acl-1.4 \
+       /var/ipfire/proxy/enable \
+       /var/ipfire/proxy/settings \
+       /var/ipfire/proxy/squid.conf \
+       /var/ipfire/proxy/transparent
+
 # Regenerate squid configuration file
-/srv/web/ipfire/cgi-bin/proxy.cgi
+sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
 
 # Generate ddns configuration file
-/srv/web/ipfire/cgi-bin/ddns.cgi
-
-touch /var/ipfire/ddns/ddns.conf
-chown nobody.nobody /var/ipfire/ddns/ddns.conf
+sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
 
 # Update crontab
 sed -i /var/spool/cron/root.orig -e "/setddns.pl/d"