core94: Ship changes from dma branch

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2015-08-25 14:02:49 +01:00
parent 8f4af2b25a
commit 7577ec1eb1
5 changed files with 13 additions and 0 deletions

View File

@@ -0,0 +1 @@
../../../common/Email-Date-Format

View File

@@ -0,0 +1 @@
../../../common/MIME-Lite

View File

@@ -0,0 +1 @@
../../../common/dma

View File

@@ -1,4 +1,7 @@
etc/system-release
etc/issue
etc/rc.d/init.d/sshd
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/cgi-bin/mail.cgi
var/ipfire/langs
var/ipfire/menu/40-services.menu

View File

@@ -54,6 +54,13 @@ 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 -qv "dma -q" || cat <<EOF >> /var/spool/cron/root.orig
# Retry sending spooled mails regularly
%hourly * /usr/sbin/dma -q
EOF
fcrontab -z &>/dev/null
# Start services