This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 83d6101b9d521029dc80f2e0144699aa815c6c40 (commit) via 51bf74a1c8783e5fa18172e9aa15cbdb7cba7cb8 (commit) via 3f42cf5cb9d2c9c6c7a1cb9f03a258ad217cb340 (commit) from bbe8e248fe143cfb618eb519dc552fa91858d902 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 83d6101b9d521029dc80f2e0144699aa815c6c40 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 21 12:05:14 2018 +0000

core119: Reload apache after configuration changes

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

commit 51bf74a1c8783e5fa18172e9aa15cbdb7cba7cb8 Author: Peter Müller peter.mueller@link38.eu Date: Tue Dec 5 14:43:17 2017 +0100

disable Apache server signature

Sending the server signature is unnecessary and might leak some internal information (although ServerTokens is already set to "Prod").

Signed-off-by: Peter Müller peter.mueller@link38.eu Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 3f42cf5cb9d2c9c6c7a1cb9f03a258ad217cb340 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 21 11:24:48 2018 +0000

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

-----------------------------------------------------------------------

Summary of changes: config/backup/include | 7 ++++++- config/httpd/global.conf | 2 +- config/rootfiles/core/119/filelists/files | 2 ++ config/rootfiles/core/119/update.sh | 1 + 4 files changed, 10 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/backup/include b/config/backup/include index ba78c69f5..59430c576 100644 --- 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/httpd/global.conf b/config/httpd/global.conf index 6cc69b55e..cc8000379 100644 --- a/config/httpd/global.conf +++ b/config/httpd/global.conf @@ -1,5 +1,5 @@ Timeout 300 -ServerSignature on +ServerSignature off UseCanonicalName off ServerTokens Prod LogLevel warn diff --git a/config/rootfiles/core/119/filelists/files b/config/rootfiles/core/119/filelists/files index c8f6cc13b..a89e1b33e 100644 --- a/config/rootfiles/core/119/filelists/files +++ b/config/rootfiles/core/119/filelists/files @@ -1,9 +1,11 @@ etc/system-release etc/issue +etc/httpd/conf/global.conf etc/rc.d/init.d/cleanfs etc/rc.d/init.d/unbound 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 diff --git a/config/rootfiles/core/119/update.sh b/config/rootfiles/core/119/update.sh index fdca22bc5..ed23e1f58 100644 --- a/config/rootfiles/core/119/update.sh +++ b/config/rootfiles/core/119/update.sh @@ -73,6 +73,7 @@ rm -vf \ /usr/lib/mysql

# Start services +/etc/init.d/apache reload

# Regenerate IPsec configuration sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi

hooks/post-receive -- IPFire 2.x development tree