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

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index f45b065..2eb7622 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -45,9 +45,15 @@ 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"),
+    ("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"),
 ]
 
 
@@ -209,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: