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 530be9ae129fe75d32dff854728750ca7d7466b5 (commit)
via 26806f2b30bccb64410fed741519aa511a0ffa8b (commit)
from ce990b420eab5d0477a067c21272d01e0c031346 (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 530be9ae129fe75d32dff854728750ca7d7466b5
Author: Sylvain Beucler <[email protected]>
Date: Tue Mar 31 12:13:26 2015 +0200
testsuite: another work-around for systemd
diff --git a/tests/func/db_reload.sh b/tests/func/db_reload.sh
index 333edbf..e0376d6 100755
--- a/tests/func/db_reload.sh
+++ b/tests/func/db_reload.sh
@@ -136,6 +136,10 @@ if [ "$backup" = 1 ]; then
rm -fr $pgdir.backup
fi
cp -a --reflink=auto $pgdir $pgdir.backup
+ # Work-around http://bugs.debian.org/759725
+ if [ -x /bin/systemctl ]; then
+ sleep 1 # bleh
+ fi
start_database
exit 0
fi
commit 26806f2b30bccb64410fed741519aa511a0ffa8b
Author: Sylvain Beucler <[email protected]>
Date: Tue Mar 31 11:40:51 2015 +0200
httpd: limit the number of top-level .conf files, to ease cherry-picking
them in multi-servers installs
diff --git a/src/etc/httpd.conf.d/02-config-main.conf
b/src/etc/httpd.conf.d/02-config-main.conf
deleted file mode 100644
index 3f11c2d..0000000
--- a/src/etc/httpd.conf.d/02-config-main.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Main directory options (${FF__core__source_path}/www contains the PHP
scripts of FusionForge)
-#
-<Directory ${FF__core__source_path}/www>
- Options Indexes FollowSymlinks
- AllowOverride All
-
- # define access restrictions for the main site
- Include ${FF__core__config_path}/httpd.conf.d/auth-main.inc
-
- #
- # PHP settings
- #
- php_admin_value default_charset "UTF-8"
- php_flag register_globals "off"
- php_flag magic_quotes_gpc "off"
-
- # Report E_ALL errors
- php_admin_value error_reporting 2147483647
-
- # Don't echo error to user
- php_admin_value display_errors 0
-
- # ...but log the errors to error.log
- php_admin_value log_errors 1
-</Directory>
diff --git a/src/etc/httpd.conf.d/04-config-vendor.conf
b/src/etc/httpd.conf.d/04-config-vendor.conf
deleted file mode 100644
index d752e34..0000000
--- a/src/etc/httpd.conf.d/04-config-vendor.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Directory options for vendor dir (${FF__core__source_path}/vendor contains
the Javascript scripts of FusionForge)
-#
-<Directory ${FF__core__source_path}/vendor>
- Options Indexes FollowSymlinks
- AllowOverride All
-
- Include ${FF__core__config_path}/httpd.conf.d/auth-main.inc
-
-</Directory>
diff --git a/src/etc/httpd.conf.d/20-vhosts-scm.conf
b/src/etc/httpd.conf.d/20-vhosts-scm.conf
index 1af25a8..3dfb1d3 100644
--- a/src/etc/httpd.conf.d/20-vhosts-scm.conf
+++ b/src/etc/httpd.conf.d/20-vhosts-scm.conf
@@ -1,7 +1,10 @@
#
-# Main host
+# SCM host
#
+# Include macros first
+IncludeOptional ${FF__core__config_path}/httpd.conf.d/vhost-scm-macros*.inc
+
# Used if you have a scm.$web_host domain
# (serving SCM repos without the main web interface installed)
diff --git a/src/etc/httpd.conf.d/vhost-main.inc
b/src/etc/httpd.conf.d/vhost-main.inc
index 95a47d2..d782cd3 100644
--- a/src/etc/httpd.conf.d/vhost-main.inc
+++ b/src/etc/httpd.conf.d/vhost-main.inc
@@ -13,8 +13,32 @@ SetEnv FF__core__config_path "${FF__core__config_path}"
UserDir disabled
</IfModule>
-# Define configuration/env variables for passing passwords and other secrets
to PHP
+# Main directory options (${FF__core__source_path}/www contains the
+# PHP scripts of FusionForge)
<Directory ${FF__core__source_path}/www>
+ Options Indexes FollowSymlinks
+ AllowOverride All
+
+ # define access restrictions for the main site
+ Include ${FF__core__config_path}/httpd.conf.d/auth-main.inc
+
+ #
+ # PHP settings
+ #
+ php_admin_value default_charset "UTF-8"
+ php_flag register_globals "off"
+ php_flag magic_quotes_gpc "off"
+
+ # Report E_ALL errors
+ php_admin_value error_reporting 2147483647
+
+ # Don't echo error to user
+ php_admin_value display_errors 0
+
+ # ...but log the errors to error.log
+ php_admin_value log_errors 1
+
+ # Define configuration/env variables for passing passwords and other secrets
to PHP
RequestHeader unset FusionForgeDbhost
RequestHeader append FusionForgeDbhost "${FF__core__database_host}"
@@ -34,6 +58,16 @@ SetEnv FF__core__config_path "${FF__core__config_path}"
RequestHeader append FusionForgeSessionKey "${FF__core__session_key}"
</Directory>
+# Directory options for vendor dir (${FF__core__source_path}/vendor
+# contains the Javascript scripts of FusionForge)
+<Directory ${FF__core__source_path}/vendor>
+ Options Indexes FollowSymlinks
+ AllowOverride All
+
+ Include ${FF__core__config_path}/httpd.conf.d/auth-main.inc
+
+</Directory>
+
<Location /projects>
ForceType application/x-httpd-php
</Location>
diff --git a/src/etc/httpd.conf.d/05-config-macros-scm.conf
b/src/etc/httpd.conf.d/vhost-scm-macros.inc
similarity index 80%
rename from src/etc/httpd.conf.d/05-config-macros-scm.conf
rename to src/etc/httpd.conf.d/vhost-scm-macros.inc
index 9112352..78070ae 100644
--- a/src/etc/httpd.conf.d/05-config-macros-scm.conf
+++ b/src/etc/httpd.conf.d/vhost-scm-macros.inc
@@ -13,3 +13,6 @@
Require user $user
</Location>
</Macro>
+
+# Note: macros defined in a separate file because they can't be
+# defined twice (e.g. included twice from http and https virtualhosts)
diff --git a/src/etc/httpd.conf.d/vhost-scm.inc
b/src/etc/httpd.conf.d/vhost-scm.inc
index 888ab9f..e0a7219 100644
--- a/src/etc/httpd.conf.d/vhost-scm.inc
+++ b/src/etc/httpd.conf.d/vhost-scm.inc
@@ -12,7 +12,7 @@ AssignGroupIDExpr %{reqenv:ITKGID}
AuthName "${FF__core__apache_auth_realm}"
AuthUserFile ${FF__core__data_path}/scm-passwd
</LocationMatch>
-# Cf. 05-config-macros-scm.conf for the 'Require User' directive
+# Cf. vhost-scm-macros.conf for the 'Require User' directive
# Load plugins after the above LocationMatch to allow specialization
IncludeOptional ${FF__core__config_path}/httpd.conf.d/vhost-scm-plugin-scm*.inc
diff --git a/src/plugins/scmsvn/etc/httpd.conf.d/05-config-macros-scmsvn.conf
b/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-macros-scmsvn.inc
similarity index 76%
rename from src/plugins/scmsvn/etc/httpd.conf.d/05-config-macros-scmsvn.conf
rename to src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-macros-scmsvn.inc
index 22d608c..74d19fd 100644
--- a/src/plugins/scmsvn/etc/httpd.conf.d/05-config-macros-scmsvn.conf
+++ b/src/plugins/scmsvn/etc/httpd.conf.d/vhost-scm-macros-scmsvn.inc
@@ -9,3 +9,6 @@
# -> Can't open file '/srv/svn/authscm/format'
</Location>
</Macro>
+
+# Note: macros defined in a separate file because they can't be
+# defined twice (e.g. included twice from http and https virtualhosts)
-----------------------------------------------------------------------
Summary of changes:
src/etc/httpd.conf.d/02-config-main.conf | 26 --------------
src/etc/httpd.conf.d/04-config-vendor.conf | 10 ------
src/etc/httpd.conf.d/20-vhosts-scm.conf | 5 ++-
src/etc/httpd.conf.d/vhost-main.inc | 36 +++++++++++++++++++-
...config-macros-scm.conf => vhost-scm-macros.inc} | 3 ++
src/etc/httpd.conf.d/vhost-scm.inc | 2 +-
...ros-scmsvn.conf => vhost-scm-macros-scmsvn.inc} | 3 ++
tests/func/db_reload.sh | 4 +++
8 files changed, 50 insertions(+), 39 deletions(-)
delete mode 100644 src/etc/httpd.conf.d/02-config-main.conf
delete mode 100644 src/etc/httpd.conf.d/04-config-vendor.conf
rename src/etc/httpd.conf.d/{05-config-macros-scm.conf =>
vhost-scm-macros.inc} (80%)
rename src/plugins/scmsvn/etc/httpd.conf.d/{05-config-macros-scmsvn.conf =>
vhost-scm-macros-scmsvn.inc} (76%)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
