Add deadfoxjunction wipi configuration.

[matthijs/projects/wipi.git] / conf / farmconfig.py

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 0fc161dfc03d2f5008ba7f66d0856cce05fcbc32..2eb76223dd71a33f4ff54fea84400aebc89d438f 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -45,14 +45,15 @@ wikis = [
 
     # wikiname,     url regular expression (no protocol)
     # ---------------------------------------------------------------
+    ("extinction", r"extinction.evolution-events.nl/wipi"),
     ("exodus", r"exodus.evolution-events.nl/wipi"),
-    ("exodus", r"exodus-nieuw.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 site in the exodus config,
-    # all links still work too!
-    ("exodus", r"exodus-nieuw.evolution-events.nl"),
-    ("extinction", r"extinction.evolution-events.nl/wipi"),
+    # 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"),
 ]
 
 
@@ -214,9 +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: