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

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 5717543..f45b065 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -46,6 +46,7 @@ wikis = [
     # wikiname,     url regular expression (no protocol)
     # ---------------------------------------------------------------
     ("exodus", r"exodus.evolution-events.nl/wipi"),
+    ("exodus", r"exodus-nieuw.evolution-events.nl/wipi"),
     ("extinction", r"extinction.evolution-events.nl/wipi"),
 ]
 
@@ -70,7 +71,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 +95,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