[Fusionforge-commits] r14631 - in trunk: . src/etc/httpd.conf.d src/plugins/moinmoin/cronjobs src/plugins/moinmoin/etc src/plugins/moinmoin/packaging/install src/plugins/moinmoin/packaging/links src/plugins/moinmoin/wsgi

Roland Mas lolando at fusionforge.org
Fri Oct 14 18:03:59 CEST 2011


Author: lolando
Date: 2011-10-14 18:03:59 +0200 (Fri, 14 Oct 2011)
New Revision: 14631

Added:
   trunk/src/plugins/moinmoin/etc/farmconfig.py
   trunk/src/plugins/moinmoin/packaging/links/plugin-moinmoin
Removed:
   trunk/src/plugins/moinmoin/etc/wikiconfig.py
   trunk/src/plugins/moinmoin/packaging/links/plugin-mediawiki
Modified:
   trunk/
   trunk/src/etc/httpd.conf.d/plugin-moinmoin.inc
   trunk/src/plugins/moinmoin/cronjobs/create-wikis.php
   trunk/src/plugins/moinmoin/packaging/install/plugin-moinmoin
   trunk/src/plugins/moinmoin/wsgi/moin.wsgi
Log:
Multi-wiki configuration

Modified: trunk/src/etc/httpd.conf.d/plugin-moinmoin.inc
===================================================================
--- trunk/src/etc/httpd.conf.d/plugin-moinmoin.inc	2011-10-14 16:03:45 UTC (rev 14630)
+++ trunk/src/etc/httpd.conf.d/plugin-moinmoin.inc	2011-10-14 16:03:59 UTC (rev 14631)
@@ -12,4 +12,4 @@
 </Directory>
 
 WSGIProcessGroup fusionforge-plugin-moinmoin
-WSGIScriptAliasMatch /plugins/moinmoin/[-_a-zA-Z0-9]*/.* "/usr/share/gforge/plugins/moinmoin/wsgi/moin.wsgi"
+WSGIScriptAliasMatch /plugins/moinmoin/[-_a-zA-Z0-9]*/.* "/var/lib/gforge/plugins/moinmoin/wikidata/moin.wsgi"

Modified: trunk/src/plugins/moinmoin/cronjobs/create-wikis.php
===================================================================
--- trunk/src/plugins/moinmoin/cronjobs/create-wikis.php	2011-10-14 16:03:45 UTC (rev 14630)
+++ trunk/src/plugins/moinmoin/cronjobs/create-wikis.php	2011-10-14 16:03:59 UTC (rev 14631)
@@ -65,7 +65,8 @@
     interwikiname = u'$project'
     page_front_page = u'FrontPage'
 
-    data_dir = '$project_dir'
+    data_dir = '$project_dir/data'
+    data_underlay_dir = '$project_dir/underlay'
 ");
 		fclose($f);
 		       

Copied: trunk/src/plugins/moinmoin/etc/farmconfig.py (from rev 14630, trunk/src/plugins/moinmoin/etc/wikiconfig.py)
===================================================================
--- trunk/src/plugins/moinmoin/etc/farmconfig.py	                        (rev 0)
+++ trunk/src/plugins/moinmoin/etc/farmconfig.py	2011-10-14 16:03:59 UTC (rev 14631)
@@ -0,0 +1,24 @@
+# -*- coding: iso-8859-1 mode:python -*-
+
+from MoinMoin.config import multiconfig
+import fusionforge
+
+class FarmConfig(multiconfig.DefaultConfig):
+
+    # basic options (you normally need to change these)
+    sitename = u'ForgeWiki' # [Unicode]
+    interwikiname = u'ForgeWiki' # [Unicode]
+
+    page_front_page = u"FrontPage"
+
+    ffsa = fusionforge.FusionForgeSessionAuth()
+
+    auth = [ffsa]
+    superuser = ffsa.get_super_users()
+
+ff_link = fusionforge.FusionForgeLink()
+ff_host = ff_link.get_config('web_host')
+wikis = []
+for project in ff_link.get_projects():
+    wikis.append((project, "^https?://"+ff_host+"/plugins/moinmoin/"+project+"/.*$"),)
+

Deleted: trunk/src/plugins/moinmoin/etc/wikiconfig.py
===================================================================
--- trunk/src/plugins/moinmoin/etc/wikiconfig.py	2011-10-14 16:03:45 UTC (rev 14630)
+++ trunk/src/plugins/moinmoin/etc/wikiconfig.py	2011-10-14 16:03:59 UTC (rev 14631)
@@ -1,37 +0,0 @@
-# -*- coding: iso-8859-1 mode:python -*-
-
-from MoinMoin.config import multiconfig
-import fusionforge
-
-import sys
-sys.path.insert(0, '/etc/moin')
-import farmconfig
-
-class Config(farmconfig.FarmConfig):
-
-    # basic options (you normally need to change these)
-    sitename = u'ForgeWiki' # [Unicode]
-    interwikiname = u'ForgeWiki' # [Unicode]
-
-    # name of entry page / front page [Unicode], choose one of those:
-
-    # a) if most wiki content is in a single language
-    #page_front_page = u"MyStartingPage"
-
-    # b) if wiki content is maintained in many languages
-    page_front_page = u"FrontPage"
-
-    # data_dir = '/var/lib/gforge/plugins/moinmoin/wikidata/data'
-    # data_underlay_dir = '/var/lib/gforge/plugins/moinmoin/wikidata/underlay'
-
-    ffsa = fusionforge.FusionForgeSessionAuth()
-
-    auth = [ffsa]
-    superuser = ffsa.get_super_users()
-
-    ff_link = fusionforge.FusionForgeLink()
-    ff_host = ff_link.get_config('web_host')
-    farmconfig.wikis = []
-    for project in ff_link.get_projects():
-        farmconfig.wikis.append(("project", "^https?://"+ff_host+"/plugins/moinmoin/"+project+"/.*$"),)
-

Modified: trunk/src/plugins/moinmoin/packaging/install/plugin-moinmoin
===================================================================
--- trunk/src/plugins/moinmoin/packaging/install/plugin-moinmoin	2011-10-14 16:03:45 UTC (rev 14630)
+++ trunk/src/plugins/moinmoin/packaging/install/plugin-moinmoin	2011-10-14 16:03:59 UTC (rev 14631)
@@ -6,4 +6,4 @@
 plugins/moinmoin/www/*            usr/share/gforge/plugins/moinmoin/www/
 plugins/moinmoin/wsgi/moin.wsgi   usr/share/gforge/plugins/moinmoin/wsgi
 plugins/moinmoin/etc/*.ini 	  etc/@PACKAGE@/config.ini.d/
-plugins/moinmoin/etc/wikiconfig.py		  etc/@PACKAGE@/plugins/moinmoin
\ No newline at end of file
+plugins/moinmoin/etc/farmconfig.py		  etc/@PACKAGE@/plugins/moinmoin
\ No newline at end of file

Deleted: trunk/src/plugins/moinmoin/packaging/links/plugin-mediawiki
===================================================================
--- trunk/src/plugins/moinmoin/packaging/links/plugin-mediawiki	2011-10-14 16:03:45 UTC (rev 14630)
+++ trunk/src/plugins/moinmoin/packaging/links/plugin-mediawiki	2011-10-14 16:03:59 UTC (rev 14631)
@@ -1,17 +0,0 @@
-usr/share/mediawiki/api.php			usr/share/gforge/plugins/mediawiki/www/api.php
-usr/share/mediawiki/extensions			usr/share/gforge/plugins/mediawiki/www/extensions
-usr/share/mediawiki/img_auth.php		usr/share/gforge/plugins/mediawiki/www/img_auth.php
-usr/share/mediawiki/includes			usr/share/gforge/plugins/mediawiki/www/includes
-usr/share/mediawiki/index.php			usr/share/gforge/plugins/mediawiki/www/index.php
-usr/share/mediawiki/languages			usr/share/gforge/plugins/mediawiki/www/languages
-usr/share/mediawiki/maintenance			usr/share/gforge/plugins/mediawiki/www/maintenance
-usr/share/mediawiki/opensearch_desc.php		usr/share/gforge/plugins/mediawiki/www/opensearch_desc.php
-usr/share/mediawiki/profileinfo.php		usr/share/gforge/plugins/mediawiki/www/profileinfo.php
-usr/share/mediawiki/redirect.php		usr/share/gforge/plugins/mediawiki/www/redirect.php
-usr/share/mediawiki/StartProfiler.php		usr/share/gforge/plugins/mediawiki/www/StartProfiler.php
-usr/share/mediawiki/thumb.php			usr/share/gforge/plugins/mediawiki/www/thumb.php
-usr/share/mediawiki/trackback.php		usr/share/gforge/plugins/mediawiki/www/trackback.php
-
-usr/share/mediawiki/skins			usr/share/gforge/plugins/mediawiki/www/skins
-
-usr/share/mediawiki				var/lib/gforge/plugins/mediawiki/master

Copied: trunk/src/plugins/moinmoin/packaging/links/plugin-moinmoin (from rev 14630, trunk/src/plugins/moinmoin/packaging/links/plugin-mediawiki)
===================================================================
--- trunk/src/plugins/moinmoin/packaging/links/plugin-moinmoin	                        (rev 0)
+++ trunk/src/plugins/moinmoin/packaging/links/plugin-moinmoin	2011-10-14 16:03:59 UTC (rev 14631)
@@ -0,0 +1,2 @@
+etc/@PACKAGE@/plugins/moinmoin/farmconfig.py	var/lib/gforge/plugins/moinmoin/wikidata/farmconfig.py
+usr/share/gforge/plugins/moinmoin/wsgi/moin.wsgi	var/lib/gforge/plugins/moinmoin/wikidata/moin.wsgi

Modified: trunk/src/plugins/moinmoin/wsgi/moin.wsgi
===================================================================
--- trunk/src/plugins/moinmoin/wsgi/moin.wsgi	2011-10-14 16:03:45 UTC (rev 14630)
+++ trunk/src/plugins/moinmoin/wsgi/moin.wsgi	2011-10-14 16:03:59 UTC (rev 14631)
@@ -8,7 +8,7 @@
 
 import sys, os
 
-sys.path.insert(0, '/etc/fusionforge/plugins/moinmoin')
+sys.path.insert(0, '/var/lib/gforge/plugins/moinmoin/wikidata')
 sys.path.insert(0, '/usr/share/gforge/plugins/moinmoin/lib')
 from MoinMoin.web.serving import make_application
 application = make_application(shared=True)




More information about the Fusionforge-commits mailing list