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 bd8a92a44b2ba0ae4c7f0cd26fab23c3f5fe2d11 (commit)
via a7e0185fc1a4136dc363608d09c542df644dbae3 (commit)
from ecd743fd61b17cc35cc497184714599a46f3b75f (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bd8a92a44b2ba0ae4c7f0cd26fab23c3f5fe2d11
commit bd8a92a44b2ba0ae4c7f0cd26fab23c3f5fe2d11
Author: Franck Villaume <[email protected]>
Date: Fri Aug 26 15:03:00 2016 +0200
fix url_prefix in httpd config. related to [#643]
diff --git a/src/etc/httpd.conf.d/vhost-list.inc
b/src/etc/httpd.conf.d/vhost-list.inc
index 246a2a6..3e0a637 100644
--- a/src/etc/httpd.conf.d/vhost-list.inc
+++ b/src/etc/httpd.conf.d/vhost-list.inc
@@ -1,18 +1,19 @@
ServerName ${FF__core__lists_host}
+ServerPath ${FF__core__url_prefix}
RewriteEngine on
-RewriteRule ^/$ /mailman/listinfo [R=301]
+RewriteRule ^/$ ${FF__core__url_prefix}/mailman/listinfo [R=301]
-ScriptAlias /mailman/ ${FF__core__mailman_cgi_path}/
+ScriptAlias ${FF__core__url_prefix}/mailman/ ${FF__core__mailman_cgi_path}/
<Directory ${FF__core__mailman_cgi_path}/>
Require all granted
</Directory>
-Alias /pipermail /var/lib/mailman/archives/public
+Alias ${FF__core__url_prefix}/pipermail /var/lib/mailman/archives/public
<Directory /var/lib/mailman/archives/public>
AllowOverride Options
Options FollowSymLinks
Require all granted
</Directory>
-Alias /images/mailman /usr/share/images/mailman
+Alias ${FF__core__url_prefix}/images/mailman /usr/share/images/mailman
diff --git a/src/etc/httpd.conf.d/vhost-main.inc
b/src/etc/httpd.conf.d/vhost-main.inc
index d782cd3..5f58d33 100644
--- a/src/etc/httpd.conf.d/vhost-main.inc
+++ b/src/etc/httpd.conf.d/vhost-main.inc
@@ -4,6 +4,7 @@
ServerName ${FF__core__web_host}
ServerAlias www.${FF__core__web_host}
ServerAdmin webmaster@${FF__core__web_host}
+ServerPath ${FF__core__url_prefix}
DocumentRoot ${FF__core__source_path}/www
DirectoryIndex index.html index.php
@@ -18,42 +19,42 @@ SetEnv FF__core__config_path "${FF__core__config_path}"
<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}"
-
+
RequestHeader unset FusionForgeDbport
RequestHeader append FusionForgeDbport "${FF__core__database_port}"
-
+
RequestHeader unset FusionForgeDbname
RequestHeader append FusionForgeDbname "${FF__core__database_name}"
-
+
RequestHeader unset FusionForgeDbuser
RequestHeader append FusionForgeDbuser "${FF__core__database_user}"
-
+
RequestHeader unset FusionForgeDbpasswd
RequestHeader append FusionForgeDbpasswd "${FF__core__database_password}"
-
+
RequestHeader unset FusionForgeSessionKey
RequestHeader append FusionForgeSessionKey "${FF__core__session_key}"
</Directory>
@@ -63,32 +64,32 @@ SetEnv FF__core__config_path "${FF__core__config_path}"
<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>
+<Location ${FF__core__url_prefix}/projects>
ForceType application/x-httpd-php
</Location>
-<Location /users>
+<Location ${FF__core__url_prefix}/users>
ForceType application/x-httpd-php
</Location>
IncludeOptional ${FF__core__config_path}/httpd.conf.d/plugin-*.inc
-Alias /images/ ${FF__core__source_path}/www/images/
-Alias /scripts/coolfieldset/ ${FF__core__source_path}/vendor/coolfieldset/
-Alias /scripts/iframe-resizer/ ${FF__core__source_path}/vendor/iframe-resizer/
-Alias /scripts/jquery/ ${FF__core__source_path}/vendor/jquery/
-Alias /scripts/jquery-ui/ ${FF__core__source_path}/vendor/jquery-ui/
-Alias /scripts/jquery-storage/ ${FF__core__source_path}/vendor/jquery-storage/
-Alias /scripts/jquery-simpletreemenu/
${FF__core__source_path}/vendor/jquery-simpletreemenu/
-Alias /scripts/jquery-jqplot/ ${FF__core__source_path}/vendor/jquery-jqplot/
-Alias /scripts/jquery-livequery/
${FF__core__source_path}/vendor/jquery-livequery/
-Alias /scripts/jquery-teamwork-gantt/
${FF__core__source_path}/vendor/jquery-teamwork-gantt/
-Alias /scripts/jquery-splitter/
${FF__core__source_path}/vendor/jquery-splitter/
-Alias /scripts/jquery-auto-height/
${FF__core__source_path}/vendor/jquery-auto-height/
+Alias ${FF__core__url_prefix}/images/ ${FF__core__source_path}/www/images/
+Alias ${FF__core__url_prefix}/scripts/coolfieldset/
${FF__core__source_path}/vendor/coolfieldset/
+Alias ${FF__core__url_prefix}/scripts/iframe-resizer/
${FF__core__source_path}/vendor/iframe-resizer/
+Alias ${FF__core__url_prefix}/scripts/jquery/
${FF__core__source_path}/vendor/jquery/
+Alias ${FF__core__url_prefix}/scripts/jquery-ui/
${FF__core__source_path}/vendor/jquery-ui/
+Alias ${FF__core__url_prefix}/scripts/jquery-storage/
${FF__core__source_path}/vendor/jquery-storage/
+Alias ${FF__core__url_prefix}/scripts/jquery-simpletreemenu/
${FF__core__source_path}/vendor/jquery-simpletreemenu/
+Alias ${FF__core__url_prefix}/scripts/jquery-jqplot/
${FF__core__source_path}/vendor/jquery-jqplot/
+Alias ${FF__core__url_prefix}/scripts/jquery-livequery/
${FF__core__source_path}/vendor/jquery-livequery/
+Alias ${FF__core__url_prefix}/scripts/jquery-teamwork-gantt/
${FF__core__source_path}/vendor/jquery-teamwork-gantt/
+Alias ${FF__core__url_prefix}/scripts/jquery-splitter/
${FF__core__source_path}/vendor/jquery-splitter/
+Alias ${FF__core__url_prefix}/scripts/jquery-auto-height/
${FF__core__source_path}/vendor/jquery-auto-height/
# For FusionForge without DNS delegation, uncomment this
# and remove 30-vhosts-projects.conf
diff --git a/src/etc/httpd.conf.d/vhost-scm-macros.inc
b/src/etc/httpd.conf.d/vhost-scm-macros.inc
index 78070ae..52c68f3 100644
--- a/src/etc/httpd.conf.d/vhost-scm-macros.inc
+++ b/src/etc/httpd.conf.d/vhost-scm-macros.inc
@@ -9,7 +9,7 @@
# Note: when setting ITKUID, the user's groups (project memberships) are
added
# Note: it's important to set ITKGID, otherwise privilege separation breaks
as gid stays 'www-data'
- <Location /authscm/$user/>
+ <Location ${FF__core__url_prefix}/authscm/$user/>
Require user $user
</Location>
</Macro>
diff --git a/src/etc/httpd.conf.d/vhost-scm.inc
b/src/etc/httpd.conf.d/vhost-scm.inc
index e0a7219..86c2b95 100644
--- a/src/etc/httpd.conf.d/vhost-scm.inc
+++ b/src/etc/httpd.conf.d/vhost-scm.inc
@@ -1,4 +1,5 @@
ServerName ${FF__core__scm_host}
+ServerPath ${FF__core__url_prefix}
SetEnvIf Request_URI . ITKUID=${FF__core__apache_user}
SetEnvIf Request_URI . ITKGID=${FF__core__apache_group}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a7e0185fc1a4136dc363608d09c542df644dbae3
commit a7e0185fc1a4136dc363608d09c542df644dbae3
Author: Franck Villaume <[email protected]>
Date: Fri Aug 26 15:00:27 2016 +0200
empty lines
diff --git a/src/etc/httpd.conf.d/ssl-on-scm.inc
b/src/etc/httpd.conf.d/ssl-on-scm.inc
index 8cf1d53..d73fbab 100644
--- a/src/etc/httpd.conf.d/ssl-on-scm.inc
+++ b/src/etc/httpd.conf.d/ssl-on-scm.inc
@@ -2,23 +2,23 @@
# and user can disable SSL in ssl-on.inc
#<IfModule mod_ssl.c>
SSLEngine on
-
+
SSLCertificateFile ${FF__core__config_path}/ssl-cert-scm.pem
SSLCertificateKeyFile ${FF__core__config_path}/ssl-cert-scm.key
-
+
<Files ~ "\.(cgi|shtml)$">
SSLOptions +StdEnvVars
</Files>
-
+
<Directory "/usr/lib/cgi-bin">
SSLOptions +StdEnvVars
</Directory>
-
+
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
#</IfModule>
<IfModule apache_ssl.c>
SSLEnable
-
+
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
</IfModule>
diff --git a/src/etc/httpd.conf.d/ssl-on.inc b/src/etc/httpd.conf.d/ssl-on.inc
index d1638ee..1b74c68 100644
--- a/src/etc/httpd.conf.d/ssl-on.inc
+++ b/src/etc/httpd.conf.d/ssl-on.inc
@@ -2,23 +2,23 @@
# and user can disable SSL in ssl-on.inc
#<IfModule mod_ssl.c>
SSLEngine on
-
+
SSLCertificateFile ${FF__core__config_path}/ssl-cert.pem
SSLCertificateKeyFile ${FF__core__config_path}/ssl-cert.key
-
+
<Files ~ "\.(cgi|shtml)$">
SSLOptions +StdEnvVars
</Files>
-
+
<Directory "/usr/lib/cgi-bin">
SSLOptions +StdEnvVars
</Directory>
-
+
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
#</IfModule>
<IfModule apache_ssl.c>
SSLEnable
-
+
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
</IfModule>
-----------------------------------------------------------------------
Summary of changes:
src/etc/httpd.conf.d/ssl-on-scm.inc | 10 +++---
src/etc/httpd.conf.d/ssl-on.inc | 10 +++---
src/etc/httpd.conf.d/vhost-list.inc | 9 +++---
src/etc/httpd.conf.d/vhost-main.inc | 53 ++++++++++++++++---------------
src/etc/httpd.conf.d/vhost-scm-macros.inc | 2 +-
src/etc/httpd.conf.d/vhost-scm.inc | 1 +
6 files changed, 44 insertions(+), 41 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
