X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=f2b8cca19ebc06c977f12b1943bef2deeaf78066;hb=5fe707fd587663bdc427205f177569716729b291;hp=f8c657d29563bbaf6f0304c98655daf2f0710814;hpb=cc733b1eba60b8c07e42d573c36c14e884c31049;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index f8c657d..f2b8cca 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -46,10 +46,7 @@ wikis = [
     # wikiname,     url regular expression (no protocol)
     # ---------------------------------------------------------------
     ("exodus", r"exodus.evolution-events.nl/wipi"),
-
-    # for multiple wikis, do something like this:
-    #("moinmoin",    r"^moinmo.in/.*$"),
-    #("moinmaster",  r"^master.moinmo.in/.*$"),
+    ("extinction", r"extinction.evolution-events.nl/wipi"),
 ]
 
 
@@ -73,7 +70,7 @@ from MoinMoin.config.multiconfig import DefaultConfig
 # Local setting, defined by matthijs for easy moving of data. It didn't work
 # to define this in the FarmConfig class, so just put it here..
 import os
-data_dir_root = os.path.join(os.path.dirname(__file__), os.path.pardir, 'data')
+data_dir_root = os.path.join(os.environ['SITE_DIR'], 'data', 'wipi')
 
 class FarmConfig(DefaultConfig):
 
@@ -97,6 +94,11 @@ class FarmConfig(DefaultConfig):
     # backup it.
     data_underlay_dir = data_dir_root + '/underlay/'
 
+    # Override the default data_dir/plugin path for plugins, which doesn't
+    # make sense. We don't want to have per-wiki plugins anyway and stuffing
+    # code in the datadir is weird.
+    plugin_dir = os.path.join(os.path.dirname(__file__), os.path.pardir, 'plugin')
+
     # The URL prefix we use to access the static stuff (img, css, js).
     # NOT touching this is maybe the best way to handle this setting as moin
     # uses a good internal default (something like '/moin_static163' for moin
@@ -199,14 +201,14 @@ class FarmConfig(DefaultConfig):
     # Authentication
     from auth.mysql_login import mysql_login # This comes from plugin
     from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname
-    from MoinMoin.auth import moin_session
     phpbb = mysql_login(
+        name    = 'phpbb',
         verbose = True,
         dbhost  = phpbb_dbhost,
         dbuser  = phpbb_dbuser,
         dbpass  = phpbb_dbpass,
         dbname  = phpbb_dbname,
     )
-    auth = [phpbb, moin_session]
+    auth = [phpbb]
 
     user_autocreate = True