Core94: fix update.sh for dma

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

diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
index e679ecfffd06628bc6b2cd97167da529a09ad02a..1b9eed75395299b708b4cdfdd3c82ec91cbef8b2 100644 (file)
--- a/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/core/94/update.sh
@@ -32,14 +32,53 @@ do
 done
 
 # Stop services
+/etc/init.d/squid stop
+/etc/init.d/sshd stop
+/etc/init.d/dnsmasq stop
 
 # Extract files
 extract_files
 
+# Restart init after glibc update
+telinit u
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Update SSH configuration
+sed -i /etc/ssh/sshd_config \
+       -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/'
+
+# Move away old and unsupported keys
+mv -f /etc/ssh/ssh_host_dsa_key{,.old}
+# Regenerating weak RSA keys
+mv -f /etc/ssh/ssh_host_key{,.old}
+mv -f /etc/ssh/ssh_host_rsa_key{,.old}
+
+# Update crontab
+sed -i /var/spool/cron/root.orig -e "/Force an update once a month/d"
+sed -i /var/spool/cron/root.orig -e "/ddns update-all --force/d"
+
+grep -q "dma -q" /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
+
+# Retry sending spooled mails regularly
+%hourly * /usr/sbin/dma -q
+
+# Cleanup the mail spool directory
+%weekly * * /usr/sbin/dma-cleanup-spool
+EOF
+
+fcrontab -z &>/dev/null
+
+# dma files
+mkdir /etc/alternatives
+mkdir /var/lib/alternatives
+/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.dma 20
+
 # Start services
+/etc/init.d/dnsmasq start
+/etc/init.d/sshd start
+/etc/init.d/squid start
 
 # This update need a reboot...
 #touch /var/run/need_reboot