[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dadfa436c9fbe800b1060e673bc17d96ef827874

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dadfa436c9fbe800b1060e673bc17d96ef827874

[git]

[-- Attachment #1: Type: text/plain, Size: 2929 bytes --]

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  dadfa436c9fbe800b1060e673bc17d96ef827874 (commit)
       via  a7006325c0bd39cb9f60c77e41cae81893205752 (commit)
      from  6c4319a1b890ceb10e2f087e945841aaefac32d6 (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 dadfa436c9fbe800b1060e673bc17d96ef827874
Merge: a700632 6c4319a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Oct 15 22:55:54 2014 +0200

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit a7006325c0bd39cb9f60c77e41cae81893205752
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Oct 15 22:55:26 2014 +0200

    apache: Disable SSLv3 by default for the IPFire webinterface

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

Summary of changes:
 config/httpd/vhosts.d/ipfire-interface-ssl.conf | 2 +-
 config/rootfiles/core/85/filelists/files        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
index dc6bb21..daac757 100644
--- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf
+++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf
@@ -8,7 +8,7 @@
     ErrorLog /var/log/httpd/error_log
     TransferLog /var/log/httpd/access_log
     SSLEngine on
-    SSLProtocol all -SSLv2
+    SSLProtocol all -SSLv2 -SSLv3
     SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128:AES256:HIGH:!RC4:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK
     SSLHonorCipherOrder on
     SSLCertificateFile /etc/httpd/server.crt
diff --git a/config/rootfiles/core/85/filelists/files b/config/rootfiles/core/85/filelists/files
index 168c7d1..9cf259c 100644
--- a/config/rootfiles/core/85/filelists/files
+++ b/config/rootfiles/core/85/filelists/files
@@ -1,3 +1,4 @@
 etc/system-release
 etc/issue
+etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 var/ipfire/langs


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