[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 78822f771fcdb9997618dfe9c86e8f585fee5161

Roland Mas lolando at fusionforge.org
Wed Jun 26 12:18:28 CEST 2013


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 "FusionForge".

The branch, Branch_5_2 has been updated
       via  78822f771fcdb9997618dfe9c86e8f585fee5161 (commit)
      from  8909590a09086be987e468b52ecc413d2bf88efb (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 78822f771fcdb9997618dfe9c86e8f585fee5161
Author: Roland Mas <lolando at debian.org>
Date:   Wed Jun 26 12:18:18 2013 +0200

    Made Apache config snippets compatible with Apache 2.4 (ported from Thorsten's branch, thanks)

diff --git a/src/etc/httpd.conf.d/01-namevhost.conf b/src/etc/httpd.conf.d/01-namevhost.conf
index d837f4b..f34dd77 100644
--- a/src/etc/httpd.conf.d/01-namevhost.conf
+++ b/src/etc/httpd.conf.d/01-namevhost.conf
@@ -1,4 +1,6 @@
 # Name-based Virtual Host Support : supports multiple websites over a single IP address
 
-NameVirtualHost *:80
-NameVirtualHost *:443
+<IfVersion < 2.3>
+  NameVirtualHost *:80
+  NameVirtualHost *:443
+</IfVersion>
diff --git a/src/etc/httpd.conf.d/20-vhosts-lists.conf b/src/etc/httpd.conf.d/20-vhosts-lists.conf
index 368ef79..eeff91c 100644
--- a/src/etc/httpd.conf.d/20-vhosts-lists.conf
+++ b/src/etc/httpd.conf.d/20-vhosts-lists.conf
@@ -3,7 +3,12 @@
 #
 <VirtualHost *:80>
   Include {core/config_path}/httpd.conf.d/vhost-list.inc
-  Include {core/config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
+  <IfVersion >= 2.3>
+    IncludeOptional {core/config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
+  </IfVersion>
+  <IfVersion < 2.3>
+    Include {core/config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
+  </IfVersion>
 
   RewriteEngine on  
   RewriteRule ^/$ http://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
@@ -14,7 +19,12 @@
 </VirtualHost>
 <VirtualHost *:443>
   Include {core/config_path}/httpd.conf.d/vhost-list.inc
-  Include {core/config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
+  <IfVersion >= 2.3>
+    IncludeOptional {core/config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
+  </IfVersion>
+  <IfVersion < 2.3>
+    Include {core/config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
+  </IfVersion>
   
   RewriteEngine on  
   RewriteRule ^/$ https://%{HTTP_HOST}/cgi-bin/mailman/listinfo [R=301]
diff --git a/src/etc/httpd.conf.d/vhost-main.inc b/src/etc/httpd.conf.d/vhost-main.inc
index 25f2565..b81d988 100644
--- a/src/etc/httpd.conf.d/vhost-main.inc
+++ b/src/etc/httpd.conf.d/vhost-main.inc
@@ -23,7 +23,12 @@ DirectoryIndex index.html index.php
   ForceType application/x-httpd-php
 </Location>
 
-Include {core/config_path}/httpd.conf.d/plugin-*.inc
+<IfVersion >= 2.3>
+  IncludeOptional /etc/gforge/httpd.conf.d/plugin-*.inc
+</IfVersion>
+<IfVersion < 2.3>
+  Include /etc/gforge/httpd.conf.d/plugin-*.inc
+</IfVersion>
 
 Alias /images/ {core/source_path}/www/images/
 Alias /scripts/coolfieldset/ {core/source_path}/lib/vendor/coolfieldset/

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

Summary of changes:
 src/etc/httpd.conf.d/01-namevhost.conf    |    6 ++++--
 src/etc/httpd.conf.d/20-vhosts-lists.conf |   14 ++++++++++++--
 src/etc/httpd.conf.d/vhost-main.inc       |    7 ++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list