X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=a1e98ebceef59166777f9ab0a4b2321d846b3dd6;hb=83ed3faef584ea89640c411a81d3411a0b3b9d01;hp=b60963c65c88c0b9ce131c6e5544adaa30a2e2a4;hpb=78e5a10d637a17561c5242841089864a74e14d41;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index b60963c..a1e98eb 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -70,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):
 
@@ -196,14 +196,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