From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 25 Aug 2015 13:02:49 +0000 (+0100)
Subject: core94: Ship changes from dma branch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7577ec1eb17f727e6397b1e6457c05dfef0c3371;p=people%2Fms%2Fipfire-2.x.git

core94: Ship changes from dma branch

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/94/filelists/Email-Date-Format b/config/rootfiles/core/94/filelists/Email-Date-Format
new file mode 120000
index 0000000000..b98751e7e5
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/Email-Date-Format
@@ -0,0 +1 @@
+../../../common/Email-Date-Format
\ No newline at end of file
diff --git a/config/rootfiles/core/94/filelists/MIME-Lite b/config/rootfiles/core/94/filelists/MIME-Lite
new file mode 120000
index 0000000000..c388805c57
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/MIME-Lite
@@ -0,0 +1 @@
+../../../common/MIME-Lite
\ No newline at end of file
diff --git a/config/rootfiles/core/94/filelists/dma b/config/rootfiles/core/94/filelists/dma
new file mode 120000
index 0000000000..60f4682da8
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/dma
@@ -0,0 +1 @@
+../../../common/dma
\ No newline at end of file
diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files
index 2dce10a105..a603603973 100644
--- a/config/rootfiles/core/94/filelists/files
+++ b/config/rootfiles/core/94/filelists/files
@@ -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
diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
index 1ba38e027d..d820b11bc5 100644
--- a/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/core/94/update.sh
@@ -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