[Fusionforge-commits] r14626 - in trunk: . src/etc/httpd.conf.d src/plugins/moinmoin src/plugins/moinmoin/bin src/plugins/moinmoin/etc src/plugins/moinmoin/etc/httpd.d src/plugins/moinmoin/packaging/control src/plugins/moinmoin/packaging/dirs src/plugins/moinmoin/packaging/install src/plugins/moinmoin/wsgi

Roland Mas lolando at fusionforge.org
Fri Oct 14 18:02:34 CEST 2011


Author: lolando
Date: 2011-10-14 18:02:33 +0200 (Fri, 14 Oct 2011)
New Revision: 14626

Added:
   trunk/src/etc/httpd.conf.d/50-wsgi-moinmoin.conf
   trunk/src/etc/httpd.conf.d/plugin-moinmoin.inc
   trunk/src/plugins/moinmoin/bin/install.sh
   trunk/src/plugins/moinmoin/etc/moinmoin.ini
   trunk/src/plugins/moinmoin/etc/wikiconfig.py
   trunk/src/plugins/moinmoin/packaging/install/plugin-moinmoin
   trunk/src/plugins/moinmoin/wsgi/
   trunk/src/plugins/moinmoin/wsgi/moin.wsgi
Removed:
   trunk/src/plugins/moinmoin/etc/httpd.d/61plugin-mediawiki
   trunk/src/plugins/moinmoin/packaging/install/plugin-mediawiki
Modified:
   trunk/
   trunk/src/plugins/moinmoin/packaging/control/161plugin-moinmoin
   trunk/src/plugins/moinmoin/packaging/dirs/plugin-moinmoin
Log:
MoinMoin packaging and config

Added: trunk/src/etc/httpd.conf.d/50-wsgi-moinmoin.conf
===================================================================
--- trunk/src/etc/httpd.conf.d/50-wsgi-moinmoin.conf	                        (rev 0)
+++ trunk/src/etc/httpd.conf.d/50-wsgi-moinmoin.conf	2011-10-14 16:02:33 UTC (rev 14626)
@@ -0,0 +1 @@
+WSGIDaemonProcess fusionforge-plugin-moinmoin user=gforge group=gforge processes=4 display-name=fusionforge-plugin-moinmoin

Added: trunk/src/etc/httpd.conf.d/plugin-moinmoin.inc
===================================================================
--- trunk/src/etc/httpd.conf.d/plugin-moinmoin.inc	                        (rev 0)
+++ trunk/src/etc/httpd.conf.d/plugin-moinmoin.inc	2011-10-14 16:02:33 UTC (rev 14626)
@@ -0,0 +1,15 @@
+AliasMatch "^/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"
+<Directory "/usr/share/moin/htdocs/">
+  Options -Indexes -FollowSymlinks
+  AllowOverride None
+</Directory>
+
+WSGIProcessGroup fusionforge-plugin-moinmoin
+WSGIScriptAlias /plugins/moinmoin "/usr/share/gforge/plugins/moinmoin/wsgi/moin.wsgi"

Added: trunk/src/plugins/moinmoin/bin/install.sh
===================================================================
--- trunk/src/plugins/moinmoin/bin/install.sh	                        (rev 0)
+++ trunk/src/plugins/moinmoin/bin/install.sh	2011-10-14 16:02:33 UTC (rev 14626)
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+data_path=$(/usr/share/gforge/bin/forge_get_config data_path)
+dataprefix=$data_path/plugins/moinmoin/wikidata
+
+case "$1" in
+    configure)
+	for i in data underlay ; do
+	    if ! [ -e $prefix/$i ] ; then
+		cp -r /usr/share/moin/$i $prefix/
+		chown -R gforge:gforge $prefix/$i
+	    fi
+	done
+	;;
+    purge)
+	;;
+    *)
+        echo "Usage: $0 {configure|purge}"
+        exit 1
+esac


Property changes on: trunk/src/plugins/moinmoin/bin/install.sh
___________________________________________________________________
Added: svn:executable
   + *

Deleted: trunk/src/plugins/moinmoin/etc/httpd.d/61plugin-mediawiki
===================================================================
--- trunk/src/plugins/moinmoin/etc/httpd.d/61plugin-mediawiki	2011-10-14 16:02:24 UTC (rev 14625)
+++ trunk/src/plugins/moinmoin/etc/httpd.d/61plugin-mediawiki	2011-10-14 16:02:33 UTC (rev 14626)
@@ -1,23 +0,0 @@
-# 61plugin-mediawiki begin
-RedirectMatch 301 ^({sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
-AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/api.php {usr_share_gforge}/www/plugins/mediawiki/api.php
-AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php {usr_share_gforge}/www/plugins/mediawiki/index.php
-AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) {var_lib_gforge}/plugins/mediawiki/projects/$1/images/$2
-AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/gforge/www/plugins/mediawiki/skins/$2
-
-<Directory {var_lib_gforge}/plugins/mediawiki>
-        Options +FollowSymLinks -Indexes
-        AllowOverride All
-        order allow,deny
-        allow from all
-        # Allow mediawiki to connect to gforge
-        Include {gforge_etc}/httpd.secrets
-        php_admin_value include_path "{sys_custom_path}:/etc/gforge:{usr_share_gforge}:{usr_share_gforge}/www/include:{usr_share_gforge}/plugins:/usr/share/php:."
-</Directory>
-
-# some directories must be protected
-<DirectoryMatch {var_lib_gforge}/plugins/mediawiki/projects/[-a-zA-Z0-9_]*/images>
-        Options -FollowSymLinks
-        AllowOverride None
-</DirectoryMatch>
-# 61plugin-mediawiki end

Added: trunk/src/plugins/moinmoin/etc/moinmoin.ini
===================================================================
--- trunk/src/plugins/moinmoin/etc/moinmoin.ini	                        (rev 0)
+++ trunk/src/plugins/moinmoin/etc/moinmoin.ini	2011-10-14 16:02:33 UTC (rev 14626)
@@ -0,0 +1,9 @@
+[moinmoin]
+
+; Source dir of the MoinMoin source code.
+src_path = /usr/share/mediawiki
+
+; MoinMoin config dir.
+; This is where the forge-global stuff is stored.
+mwdata_path = "$core/data_path/plugins/moinmoin"
+

Added: trunk/src/plugins/moinmoin/etc/wikiconfig.py
===================================================================
--- trunk/src/plugins/moinmoin/etc/wikiconfig.py	                        (rev 0)
+++ trunk/src/plugins/moinmoin/etc/wikiconfig.py	2011-10-14 16:02:33 UTC (rev 14626)
@@ -0,0 +1,19 @@
+# -*- coding: iso-8859-1 mode:python -*-
+
+from MoinMoin.config import multiconfig
+class Config(multiconfig.DefaultConfig):
+
+    # 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'

Modified: trunk/src/plugins/moinmoin/packaging/control/161plugin-moinmoin
===================================================================
--- trunk/src/plugins/moinmoin/packaging/control/161plugin-moinmoin	2011-10-14 16:02:24 UTC (rev 14625)
+++ trunk/src/plugins/moinmoin/packaging/control/161plugin-moinmoin	2011-10-14 16:02:33 UTC (rev 14626)
@@ -1,4 +1,4 @@
 Package: @PACKAGE at -plugin-moinmoin
 Architecture: all
-Depends: @OLDPACKAGE at -common (>= 4.8), @OLDPACKAGE at -db-postgresql (>= 4.8) | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 (>= 4.8) | @OLDPACKAGE at -web, postgresql-contrib | mysql-server, python-moinmoin, php5-cli, ${misc:Depends}
+Depends: @OLDPACKAGE at -common (>= 4.8), @OLDPACKAGE at -db-postgresql (>= 4.8) | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 (>= 4.8) | @OLDPACKAGE at -web, python-moinmoin, libapache2-mod-wsgi, php5-cli, ${misc:Depends}
 Description: MoinMoinWiki plugin for FusionForge

Modified: trunk/src/plugins/moinmoin/packaging/dirs/plugin-moinmoin
===================================================================
--- trunk/src/plugins/moinmoin/packaging/dirs/plugin-moinmoin	2011-10-14 16:02:24 UTC (rev 14625)
+++ trunk/src/plugins/moinmoin/packaging/dirs/plugin-moinmoin	2011-10-14 16:02:33 UTC (rev 14626)
@@ -1,6 +1,7 @@
-etc/gforge/plugins/moinmoin
+etc/@PACKAGE@/plugins/moinmoin
 usr/share/gforge/plugins/moinmoin/bin
 usr/share/gforge/plugins/moinmoin/common
 usr/share/gforge/plugins/moinmoin/cronjobs
 usr/share/gforge/plugins/moinmoin/www
+usr/share/gforge/plugins/moinmoin/wsgi
 var/lib/gforge/plugins/moinmoin/wikidata

Deleted: trunk/src/plugins/moinmoin/packaging/install/plugin-mediawiki
===================================================================
--- trunk/src/plugins/moinmoin/packaging/install/plugin-mediawiki	2011-10-14 16:02:24 UTC (rev 14625)
+++ trunk/src/plugins/moinmoin/packaging/install/plugin-mediawiki	2011-10-14 16:02:33 UTC (rev 14626)
@@ -1,8 +0,0 @@
-plugins/mediawiki/*                usr/share/gforge/plugins/mediawiki/
-plugins/mediawiki/bin/*            usr/share/gforge/plugins/mediawiki/bin/
-plugins/mediawiki/common/*         usr/share/gforge/plugins/mediawiki/common/
-plugins/mediawiki/cronjobs/*       usr/share/gforge/plugins/mediawiki/cronjobs/
-plugins/mediawiki/www/*            usr/share/gforge/plugins/mediawiki/www/
-plugins/mediawiki/mediawiki-skin/* usr/share/mediawiki/skins/
-plugins/mediawiki/etc/httpd.d/*    usr/share/gforge/etc/httpd.d/
-plugins/mediawiki/etc/*.ini 	   etc/@PACKAGE@/config.ini.d/

Copied: trunk/src/plugins/moinmoin/packaging/install/plugin-moinmoin (from rev 14625, trunk/src/plugins/moinmoin/packaging/install/plugin-mediawiki)
===================================================================
--- trunk/src/plugins/moinmoin/packaging/install/plugin-moinmoin	                        (rev 0)
+++ trunk/src/plugins/moinmoin/packaging/install/plugin-moinmoin	2011-10-14 16:02:33 UTC (rev 14626)
@@ -0,0 +1,8 @@
+plugins/moinmoin/*                usr/share/gforge/plugins/moinmoin/
+plugins/moinmoin/bin/*            usr/share/gforge/plugins/moinmoin/bin/
+plugins/moinmoin/common/*         usr/share/gforge/plugins/moinmoin/common/
+plugins/moinmoin/cronjobs/*       usr/share/gforge/plugins/moinmoin/cronjobs/
+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

Added: trunk/src/plugins/moinmoin/wsgi/moin.wsgi
===================================================================
--- trunk/src/plugins/moinmoin/wsgi/moin.wsgi	                        (rev 0)
+++ trunk/src/plugins/moinmoin/wsgi/moin.wsgi	2011-10-14 16:02:33 UTC (rev 14626)
@@ -0,0 +1,13 @@
+# -*- coding: iso-8859-1 mode:python -*-
+"""
+    MoinMoin - mod_wsgi driver scrip for integration with FusionForge
+
+    @copyright: 2011 by Roland Mas
+    @license: GNU GPL, see COPYING for details.
+"""
+
+import sys, os
+
+sys.path.insert(0, '/etc/gforge/plugins/moinmoin')
+from MoinMoin.web.serving import make_application
+application = make_application(shared=True)




More information about the Fusionforge-commits mailing list