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 0956e2b55464dc91de1619b2d53b3233c041f709 (commit)
from 417850345bdc5023ac9106d9d000467c355bb213 (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=0956e2b55464dc91de1619b2d53b3233c041f709
commit 0956e2b55464dc91de1619b2d53b3233c041f709
Author: Franck Villaume <[email protected]>
Date: Fri Sep 23 17:27:34 2016 +0200
plugin moinmoin: url_prefix & http_port & https_port support
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 c760880..fa622c1 100644
--- a/src/plugins/moinmoin/etc/httpd.conf.d/plugin-moinmoin.inc
+++ b/src/plugins/moinmoin/etc/httpd.conf.d/plugin-moinmoin.inc
@@ -1,11 +1,11 @@
-AliasMatch "^/moin_static[0-9]*/applets/FCKeditor/(.*)"
"/usr/share/fckeditor/$1"
+AliasMatch "${FF__core__url_prefix}moin_static[0-9]*/applets/FCKeditor/(.*)"
"/usr/share/fckeditor/$1"
<Directory "/usr/share/fckeditor/">
Options None
AllowOverride None
</Directory>
# The path to static contents changes (named after moinmoin version).
-AliasMatch "^/moin_static[0-9]*/(.*)" "/usr/share/moin/htdocs/$1"
+AliasMatch "${FF__core__url_prefix}moin_static[0-9]*/(.*)"
"/usr/share/moin/htdocs/$1"
<Directory "/usr/share/moin/htdocs/">
Options -Indexes -FollowSymlinks
AllowOverride None
@@ -26,7 +26,7 @@ AliasMatch "^/moin_static[0-9]*/(.*)"
"/usr/share/moin/htdocs/$1"
</IfVersion>
</Location>
-<LocationMatch "^/moin_static[0-9]*/(.*)">
+<LocationMatch "${FF__core__url_prefix}moin_static[0-9]*/(.*)">
<IfVersion >= 2.3>
Require all granted
</IfVersion>
diff --git a/src/plugins/moinmoin/lib/farmconfig.py
b/src/plugins/moinmoin/lib/farmconfig.py
index 23c6f97..7047ed7 100644
--- a/src/plugins/moinmoin/lib/farmconfig.py
+++ b/src/plugins/moinmoin/lib/farmconfig.py
@@ -26,7 +26,11 @@ class FarmConfig(multiconfig.DefaultConfig):
forge_get_config = fusionforge.FusionForgeLink(session_cookies).get_config
ff_host =
fusionforge.FusionForgeLink(session_cookies).get_config('web_host')
ff_url_prefix = forge_get_config('url_prefix')
-
+ ff_http = forge_get_config('http_port')
+ if forge_get_config('use_ssl'):
+ ff_port = forge_get_config('https_port')
+ if ff_port:
+ ff_port = ':' + ff_port
auth = [ffsa]
# Defaults (overridden per project)
@@ -42,6 +46,7 @@ class FarmConfig(multiconfig.DefaultConfig):
self.project_name = project_name
self.sitename = u'%s' % project_name
self.interwikiname = u'%s' % project_name
+ self.url_prefix_static = '%smoin_static' % self.ff_url_prefix
self.data_dir = (self.__class__.forge_get_config('data_path') +
'/plugins/moinmoin/wikidata/%s/data') % project_name
self.data_underlay_dir = (self.__class__.forge_get_config('data_path')
+ '/plugins/moinmoin/wikidata/%s/underlay') % project_name
@@ -65,6 +70,6 @@ class FarmConfig(multiconfig.DefaultConfig):
WikiGroups (request))
wikis = map (lambda p: \
- (p, "^https?://%s%splugins/moinmoin/%s/.*$"
- % (FarmConfig.ff_host, FarmConfig.ff_url_prefix, p)),
+ (p, "^https?://%s%s%splugins/moinmoin/%s/.*$"
+ % (FarmConfig.ff_host, FarmConfig.ff_port,
FarmConfig.ff_url_prefix, p)),
FarmConfig.ffsa.projects)
-----------------------------------------------------------------------
Summary of changes:
src/plugins/moinmoin/etc/httpd.conf.d/plugin-moinmoin.inc | 6 +++---
src/plugins/moinmoin/lib/farmconfig.py | 11 ++++++++---
2 files changed, 11 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
