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

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 5717543..2eb7622 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -45,8 +45,15 @@ wikis = [
 
     # wikiname,     url regular expression (no protocol)
     # ---------------------------------------------------------------
-    ("exodus", r"exodus.evolution-events.nl/wipi"),
     ("extinction", r"extinction.evolution-events.nl/wipi"),
+    ("exodus", r"exodus.evolution-events.nl/wipi"),
+    ("deadfoxjunction", r"deadfoxjunction.evolution-events.nl/wipi"),
+    # Pretend we're also available at /. In reality, only the /Site pages are
+    # available there due to lighttpd rewriting. Due to proper setting of
+    # script-name by lighttpd and the url_mappings setting below all links
+    # still work too!
+    ("exodus", r"exodus.evolution-events.nl"),
+    ("deadfoxjunction", r"deadfoxjunction.evolution-events.nl"),
 ]
 
 
@@ -70,7 +77,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 +101,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
@@ -203,7 +215,15 @@ class FarmConfig(DefaultConfig):
         dbuser  = phpbb_dbuser,
         dbpass  = phpbb_dbpass,
         dbname  = phpbb_dbname,
+        hint    = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
     )
     auth = [phpbb]
 
     user_autocreate = True
+
+    # All urls that would be generated below /wipi/Site can be pointed to
+    # /Site instead, since lighttpd maps /Site to the wipis as well.
+    url_mappings = {'/wipi/Site' : '/Site'}
+
+    
+# vim: set ts=8 sts=4 sw=4 expandtab: