Core Update 173: Ship and restart Suricata

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

diff --git a/config/rootfiles/core/173/update.sh b/config/rootfiles/core/173/update.sh
index ebf583ea371fa06393301c029beed4e523c787a5..24d89c30aa9d9ca7a2390bc42d3c12aef4d8d561 100644 (file)
--- a/config/rootfiles/core/173/update.sh
+++ b/config/rootfiles/core/173/update.sh
@@ -44,8 +44,12 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/etc/rc.d/init.d/apache stop
+/etc/rc.d/init.d/ipsec stop
 /usr/local/bin/openvpnctrl -k
 /usr/local/bin/openvpnctrl -kn2n
+/etc/rc.d/init.d/sshd stop
+/etc/rc.d/init.d/suricata stop
 
 KVER="xxxKVERxxx"
 
@@ -92,6 +96,35 @@ extract_files
 ldconfig
 
 # Remove files
+rm -rvf \
+       /lib/xtables/libip6t_LOG.so \
+       /lib/xtables/libip6t_MASQUERADE.so \
+       /lib/xtables/libip6t_SNAT.so \
+       /lib/xtables/libipt_LOG.so \
+       /lib/xtables/libipt_MASQUERADE.so \
+       /lib/xtables/libipt_SNAT.so \
+       /usr/lib/libbind9-9.16.35.so \
+       /usr/lib/libdns-9.16.35.so \
+       /usr/lib/libirs-9.16.35.so \
+       /usr/lib/libisc-9.16.35.so \
+       /usr/lib/libisccc-9.16.35.so \
+       /usr/lib/libisccfg-9.16.35.so \
+       /usr/lib/libltdl.so \
+       /usr/lib/libns-9.16.35.so \
+       /usr/lib/libpixman-1.so
+
+# Remove spandsp add-on, if installed
+for addon in spandsp; do
+       if [ -e "/opt/pakfire/db/installed/meta-${addon}" ]; then
+               for i in $(</opt/pakfire/db/rootfiles/${addon}); do
+                       rm -rfv "/${i}"
+               done
+       fi
+       rm -vf \
+               /opt/pakfire/db/installed/meta-${addon} \
+               /opt/pakfire/db/meta/meta-${addon} \
+               /opt/pakfire/db/rootfiles/${addon}
+done
 
 # Update Language cache
 /usr/local/bin/update-lang-cache
@@ -99,11 +132,24 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
+if grep -q "ENABLE_IDS=on" /var/ipfire/suricata/settings; then
+       /etc/rc.d/init.d/suricata start
+fi
+/etc/rc.d/init.d/apache start
+if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then
+       /etc/init.d/sshd start
+fi
 if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
        /usr/local/bin/openvpnctrl -s
        /usr/local/bin/openvpnctrl -sn2n
 fi
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+       /etc/rc.d/init.d/ipsec start
+fi
 
 # Regenerate all initrds
 dracut --regenerate-all --force