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

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 5717543..f2b8cca 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):
 
@@ -94,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