[Fusionforge-commits] FusionForge branch master updated. 73f4a39ee0952c1481c59ff832ccb597a545cc13

Roland Mas lolando at fusionforge.org
Wed Jun 26 13:37:55 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, master has been updated
       via  73f4a39ee0952c1481c59ff832ccb597a545cc13 (commit)
       via  78822f771fcdb9997618dfe9c86e8f585fee5161 (commit)
       via  8909590a09086be987e468b52ecc413d2bf88efb (commit)
      from  7dae9453cdbf39142bf0ec69cf7ffc65ccaf94fb (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 73f4a39ee0952c1481c59ff832ccb597a545cc13
Merge: 7dae945 78822f7
Author: Roland Mas <lolando at debian.org>
Date:   Wed Jun 26 13:37:31 2013 +0200

    Merged from 5.2: Made Apache config snippets compatible with Apache 2.4 (ported from Thorsten's branch)

diff --cc src/etc/httpd.conf.d/vhost-main.inc
index 5399bd7,b81d988..2e88d57
--- a/src/etc/httpd.conf.d/vhost-main.inc
+++ b/src/etc/httpd.conf.d/vhost-main.inc
@@@ -25,19 -23,23 +25,24 @@@ SetEnv FORGE_CONFIG_PATH "{core/config_
    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/
 -Alias /scripts/jquery/ {core/source_path}/lib/vendor/jquery/
 -Alias /scripts/jquery-ui/ {core/source_path}/lib/vendor/jquery-ui/
 -Alias /scripts/jquery-tipsy/ {core/source_path}/lib/vendor/jquery-tipsy/
 -Alias /scripts/jquery-storage/ {core/source_path}/lib/vendor/jquery-storage/
 -Alias /scripts/jquery-simpletreemenu/ {core/source_path}/lib/vendor/jquery-simpletreemenu/
 -Alias /scripts/prototype/ {core/source_path}/lib/vendor/prototype/
 -Alias /scripts/scriptaculous/ {core/source_path}/lib/vendor/scriptaculous/
 -Alias /scripts/yui/ {core/source_path}/lib/vendor/yui/build/
 +Alias /scripts/coolfieldset/ {core/source_path}/vendor/coolfieldset/
 +Alias /scripts/jquery/ {core/source_path}/vendor/jquery/
 +Alias /scripts/jquery-ui/ {core/source_path}/vendor/jquery-ui/
 +Alias /scripts/jquery-tipsy/ {core/source_path}/vendor/jquery-tipsy/
 +Alias /scripts/jquery-storage/ {core/source_path}/vendor/jquery-storage/
 +Alias /scripts/jquery-simpletreemenu/ {core/source_path}/vendor/jquery-simpletreemenu/
 +Alias /scripts/jquery-jqplot/ {core/source_path}/vendor/jquery-jqplot/
 +Alias /scripts/prototype/ {core/source_path}/vendor/prototype/
 +Alias /scripts/scriptaculous/ {core/source_path}/vendor/scriptaculous/
 +Alias /scripts/yui/ {core/source_path}/vendor/yui/build/
  
  # For FusionForge without DNS delegation, uncomment this
  # and remove 30-vhosts-projects.conf

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

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