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 f878cfe164e4327f4bf3155d0f4c53b492e04629..67244c654cc9e689850d27f752af00a81bf2972b 100644 (file)
--- a/config/rootfiles/core/80/update.sh
+++ b/config/rootfiles/core/80/update.sh
@@ -32,14 +32,61 @@ do
 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
+
+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"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+# Uninstall the libgpg-error package.
+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
+sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
+
+# Generate ddns configuration file
+sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
+
+# Update crontab
+sed -i /var/spool/cron/root.orig -e "/setddns.pl/d"
+
+grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
+
+# Update dynamic DNS records every five minutes.
+# Force an update once a month
+*/5 * * * *    [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all
+3 2 1 * *      [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force
+EOF
+
+fcrontab -z &>/dev/null
 
 sync