core115: Add missing parameter to actually generate new certificates

[people/amarx/ipfire-2.x.git] / config / rootfiles / core / 115 / update.sh

diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/core/115/update.sh
index 1b91da1872d800d52a30757893c69dd10f2a7b3f..20f870d6017467baf961aefda2706c097924b565 100644 (file)
--- a/config/rootfiles/core/115/update.sh
+++ b/config/rootfiles/core/115/update.sh
@@ -35,15 +35,23 @@ done
 openvpnctrl -k
 openvpnctrl -kn2n
 
+
 # Extract files
 extract_files
 
+# Remove files
+rm -vf \
+       /srv/web/ipfire/html/dial.cgi
+
 # update linker config
 ldconfig
 
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# generate ECDSA key on existing installations to prevent Apache from crashing
+/usr/local/bin/httpscert new
+
 # Start services
 /etc/rc.d/init.d/apache2 restart
 openvpnctrl -s
@@ -59,7 +67,6 @@ EOF
 fcrontab -z
 
 # Load captive portal configuration
-/etc/rc.d/init.d/apache2 reload
 /etc/rc.d/init.d/firewall restart
 
 # Regenerate IPsec configuration
@@ -68,6 +75,10 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
        /etc/init.d/ipsec restart
 fi
 
+# Let pakfire forget the perl-PDF-API2 package
+rm -fv /opt/pakfire/db/rootfiles/perl-PDF-API2
+rm -fv /opt/pakfire/db/*/meta-perl-PDF-API2
+
 # This update need a reboot...
 #touch /var/run/need_reboot