backup: Don't backup apache configuration, keys only

In the past the apache configuration was part of the backup
and may have been restored after Core Update 118 was installed
with PHP being dropped amongst other things.

This patch will make sure that only keys are being backuped.

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

diff --git a/config/backup/include b/config/backup/include
index ba78c69f5a4310a3580dde858dcafcd6e696254c..59430c576ce8b19d8e8ab647d3b70636529080cc 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -13,7 +13,12 @@
 /etc/ipsec.user-post.conf
 /etc/sysconfig/*
 /etc/hosts*
-/etc/httpd/*
+/etc/httpd/server.crt
+/etc/httpd/server.csr
+/etc/httpd/server.key
+/etc/httpd/server-ecdsa.crt
+/etc/httpd/server-ecdsa.csr
+/etc/httpd/server-ecdsa.key
 /etc/ssh/ssh_host*
 /etc/ssh/sshd_config
 /etc/logrotate.d

diff --git a/config/rootfiles/core/119/filelists/files b/config/rootfiles/core/119/filelists/files
index c8f6cc13bbd7b96457bf17f7712c387b939aea02..1ae58334796445d72b43cf4568feea0588aec24c 100644 (file)
--- a/config/rootfiles/core/119/filelists/files
+++ b/config/rootfiles/core/119/filelists/files
@@ -6,4 +6,5 @@ srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+var/ipfire/backup/include
 var/ipfire/langs