[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1927-gb722b4d

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Jun 11 12:20:31 CEST 2017


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  b722b4dceec03b08702afc3716cf7f311580b777 (commit)
       via  b44344f6dca6cef841db811cf7ace64560e245ac (commit)
       via  688b356655dbb2555a738b6ee0629126170e9a71 (commit)
      from  a8998fc7fe2e965effeb37b6cb60e015375fb362 (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=b722b4dceec03b08702afc3716cf7f311580b777

commit b722b4dceec03b08702afc3716cf7f311580b777
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 11 12:17:35 2017 +0200

    fix double /

diff --git a/src/plugins/mediawiki/www/LocalSettings.php b/src/plugins/mediawiki/www/LocalSettings.php
index 26a5633..48f5b0a 100644
--- a/src/plugins/mediawiki/www/LocalSettings.php
+++ b/src/plugins/mediawiki/www/LocalSettings.php
@@ -96,7 +96,7 @@ if (!$g->isActive()) {
 	$exit_errorlevel = 0;
 }
 $wgSitename         = $g->getPublicName() . " Wiki";
-$wgScriptPath       = forge_get_config('url_prefix').'/plugins/mediawiki/wiki/'.$fusionforgeproject;
+$wgScriptPath       = forge_get_config('url_prefix').'plugins/mediawiki/wiki/'.$fusionforgeproject;
 
 $wgEmergencyContact = forge_get_config('admin_email');
 $wgPasswordSender = forge_get_config('admin_email');

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b44344f6dca6cef841db811cf7ace64560e245ac

commit b44344f6dca6cef841db811cf7ace64560e245ac
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 11 12:00:50 2017 +0200

    prepare mediawiki for url_prefix support

diff --git a/src/plugins/mediawiki/www/LocalSettings.php b/src/plugins/mediawiki/www/LocalSettings.php
index c5b9d02..26a5633 100644
--- a/src/plugins/mediawiki/www/LocalSettings.php
+++ b/src/plugins/mediawiki/www/LocalSettings.php
@@ -96,7 +96,7 @@ if (!$g->isActive()) {
 	$exit_errorlevel = 0;
 }
 $wgSitename         = $g->getPublicName() . " Wiki";
-$wgScriptPath       = "/plugins/mediawiki/wiki/$fusionforgeproject" ;
+$wgScriptPath       = forge_get_config('url_prefix').'/plugins/mediawiki/wiki/'.$fusionforgeproject;
 
 $wgEmergencyContact = forge_get_config('admin_email');
 $wgPasswordSender = forge_get_config('admin_email');

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=688b356655dbb2555a738b6ee0629126170e9a71

commit 688b356655dbb2555a738b6ee0629126170e9a71
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 11 11:40:38 2017 +0200

    httpd conf clean-up. more url_prefix support

diff --git a/src/etc/httpd.conf.d/projects-in-mainvhost.inc b/src/etc/httpd.conf.d/projects-in-mainvhost.inc
index 2e0e0bc..af44039 100644
--- a/src/etc/httpd.conf.d/projects-in-mainvhost.inc
+++ b/src/etc/httpd.conf.d/projects-in-mainvhost.inc
@@ -8,6 +8,5 @@ AliasMatch ^/www/([^/]*)/(.*) ${FF__core__groupdir_prefix}/$1/htdocs/$2
 <Directory ${FF__core__groupdir_prefix}>
   Options Indexes FollowSymlinks
   AllowOverride All
-  
   Include ${FF__core__config_path}/httpd.conf.d/auth-projects.inc
 </Directory>
diff --git a/src/plugins/mediawiki/etc/httpd.conf.d/plugin-mediawiki.inc b/src/plugins/mediawiki/etc/httpd.conf.d/plugin-mediawiki.inc
index 378d43a..2241a06 100644
--- a/src/plugins/mediawiki/etc/httpd.conf.d/plugin-mediawiki.inc
+++ b/src/plugins/mediawiki/etc/httpd.conf.d/plugin-mediawiki.inc
@@ -1,30 +1,24 @@
-RedirectMatch 301 ^(/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
-AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/api.php ${FF__core__source_path}/www/plugins/mediawiki/api.php
-AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php ${FF__core__source_path}/www/plugins/mediawiki/index.php
-AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/load.php ${FF__core__source_path}/www/plugins/mediawiki/load.php
-AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/img_auth.php ${FF__core__source_path}/www/plugins/mediawiki/img_auth.php
-AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) ${FF__core__data_path}/plugins/mediawiki/projects/$1/images/$2
-AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) ${FF__mediawiki__src_path}/skins/$2
-AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/extensions/(.*) ${FF__mediawiki__src_path}/extensions/$2
-AliasMatch ^/plugins/mediawiki/dumps/(.*)$ ${FF__core__data_path}/plugins/mediawiki/dumps/$1
+RedirectMatch 301 ^(${FF__core__url_prefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
+AliasMatch ^${FF__core__url_prefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/api.php ${FF__core__source_path}/www/plugins/mediawiki/api.php
+AliasMatch ^${FF__core__url_prefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php ${FF__core__source_path}/www/plugins/mediawiki/index.php
+AliasMatch ^${FF__core__url_prefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/load.php ${FF__core__source_path}/www/plugins/mediawiki/load.php
+AliasMatch ^${FF__core__url_prefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/img_auth.php ${FF__core__source_path}/www/plugins/mediawiki/img_auth.php
+AliasMatch ^${FF__core__url_prefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) ${FF__core__data_path}/plugins/mediawiki/projects/$1/images/$2
+AliasMatch ^${FF__core__url_prefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) ${FF__mediawiki__src_path}/skins/$2
+AliasMatch ^${FF__core__url_prefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/extensions/(.*) ${FF__mediawiki__src_path}/extensions/$2
+AliasMatch ^${FF__core__url_prefix}plugins/mediawiki/dumps/(.*)$ ${FF__core__data_path}/plugins/mediawiki/dumps/$1
 
 <Directory ${FF__core__data_path}/plugins/mediawiki/dumps>
-        Options -FollowSymLinks +Indexes
-        AllowOverride None
-        Require all granted
+  Options -FollowSymLinks +Indexes
+  AllowOverride None
+  Require all granted
 </Directory>
 
 <Directory ${FF__core__data_path}/plugins/mediawiki/projects>
-        Require all granted
+  Require all granted
 </Directory>
 
 <LocationMatch "${FF__core__url_prefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/skins/(.*)">
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
-    order allow,deny
-    allow from all
-  </IfVersion>
+  Require all granted
 </LocationMatch>
 
diff --git a/src/plugins/moinmoin/etc/httpd.conf.d/plugin-moinmoin.inc b/src/plugins/moinmoin/etc/httpd.conf.d/plugin-moinmoin.inc
index fa622c1..092b053 100644
--- a/src/plugins/moinmoin/etc/httpd.conf.d/plugin-moinmoin.inc
+++ b/src/plugins/moinmoin/etc/httpd.conf.d/plugin-moinmoin.inc
@@ -17,21 +17,9 @@ AliasMatch "${FF__core__url_prefix}moin_static[0-9]*/(.*)" "/usr/share/moin/htdo
 </IfModule>
 
 <Location ${FF__core__url_prefix}plugins/moinmoin>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
-    order allow,deny
-    allow from all
-  </IfVersion>
+  Require all granted
 </Location>
 
 <LocationMatch "${FF__core__url_prefix}moin_static[0-9]*/(.*)">
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
-    order allow,deny
-    allow from all
-  </IfVersion>
+  Require all granted
 </LocationMatch>

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

Summary of changes:
 src/etc/httpd.conf.d/projects-in-mainvhost.inc     |  1 -
 .../etc/httpd.conf.d/plugin-mediawiki.inc          | 34 +++++++++-------------
 src/plugins/mediawiki/www/LocalSettings.php        |  2 +-
 .../moinmoin/etc/httpd.conf.d/plugin-moinmoin.inc  | 16 ++--------
 4 files changed, 17 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list