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, 6.0 has been updated
via 425409df907b51b9537571f9fa3184d24321a92e (commit)
via ebe118db4bc1d62f7dd8433aecac4f5a008a8b8e (commit)
from 7a156a3dffa91e2c9932cbdcd8a19bb10eb92efe (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 425409df907b51b9537571f9fa3184d24321a92e
Author: Sylvain Beucler <[email protected]>
Date: Fri Mar 20 18:46:02 2015 +0100
web: allow httpd.conf to be emptied for manually selecting vhosts (could be
done by reintroducing ucf, but meh)
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index ce3088b..cabb9af 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -46,10 +46,13 @@ case "$1" in
$0 update-defines
# '${FF__core__config_path}' not yet available in the top-level config
file, so generate it:
- cat > $config_path/httpd.conf <<-EOF
- # Include all FusionForge-related configuration files
- Include $config_path/httpd.conf.d/*.conf
- EOF
+ # (unless it was manually emptied, meaning sites will be individually
enabled e.g. via Puppet)
+ if [ ! -e $config_path/httpd.conf -o -s $config_path/httpd.conf ]; then
+ cat > $config_path/httpd.conf <<-EOF
+ # Include all FusionForge-related configuration files
+ Include $config_path/httpd.conf.d/*.conf
+ EOF
+ fi
apache_user=$(forge_get_config apache_user)
apache_group=$(forge_get_config apache_group)
commit ebe118db4bc1d62f7dd8433aecac4f5a008a8b8e
Author: Sylvain Beucler <[email protected]>
Date: Fri Mar 20 18:34:21 2015 +0100
web: remove apache 2.2 snippets
diff --git a/src/etc/httpd.conf.d/01-namevhost.conf
b/src/etc/httpd.conf.d/01-namevhost.conf
deleted file mode 100644
index f34dd77..0000000
--- a/src/etc/httpd.conf.d/01-namevhost.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Name-based Virtual Host Support : supports multiple websites over a single
IP address
-
-<IfVersion < 2.3>
- NameVirtualHost *:80
- NameVirtualHost *:443
-</IfVersion>
diff --git a/src/etc/httpd.conf.d/auth-main.inc
b/src/etc/httpd.conf.d/auth-main.inc
index 389cb30..67b7fda 100644
--- a/src/etc/httpd.conf.d/auth-main.inc
+++ b/src/etc/httpd.conf.d/auth-main.inc
@@ -1,9 +1,2 @@
# HTTP Basic Auth hook for the forge itself
-
-<IfVersion >= 2.3>
- Require all granted
-</IfVersion>
-<IfVersion < 2.3>
- order allow,deny
- allow from all
-</IfVersion>
+Require all granted
diff --git a/src/etc/httpd.conf.d/auth-projects.inc
b/src/etc/httpd.conf.d/auth-projects.inc
index a7b43d4..ff39fe0 100644
--- a/src/etc/httpd.conf.d/auth-projects.inc
+++ b/src/etc/httpd.conf.d/auth-projects.inc
@@ -1,9 +1,2 @@
# HTTP Basic Auth hook for the project vhosts
-
-<IfVersion >= 2.3>
- Require all granted
-</IfVersion>
-<IfVersion < 2.3>
- order allow,deny
- allow from all
-</IfVersion>
+Require all granted
diff --git a/src/etc/httpd.conf.d/vhost-list.inc
b/src/etc/httpd.conf.d/vhost-list.inc
index 780d65f..92cfd09 100644
--- a/src/etc/httpd.conf.d/vhost-list.inc
+++ b/src/etc/httpd.conf.d/vhost-list.inc
@@ -2,12 +2,7 @@ ServerName ${FF__core__lists_host}
SetEnv FF__core__config_path "${FF__core__config_path}"
-<IfVersion >= 2.3>
- IncludeOptional
${FF__core__config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
-</IfVersion>
-<IfVersion < 2.3>
- Include ${FF__core__config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
-</IfVersion>
+IncludeOptional ${FF__core__config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ /cgi-bin/mailman/listinfo [R=301]
-----------------------------------------------------------------------
Summary of changes:
src/etc/httpd.conf.d/01-namevhost.conf | 6 ------
src/etc/httpd.conf.d/auth-main.inc | 9 +--------
src/etc/httpd.conf.d/auth-projects.inc | 9 +--------
src/etc/httpd.conf.d/vhost-list.inc | 7 +------
src/post-install.d/web/web.sh | 11 +++++++----
5 files changed, 10 insertions(+), 32 deletions(-)
delete mode 100644 src/etc/httpd.conf.d/01-namevhost.conf
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
