X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=b4011c71a86e0fb99d78355a4b6677183b902ba1;hb=a4579debe2c4ad40692bcb3dd9ed135af1a30947;hp=0fc161dfc03d2f5008ba7f66d0856cce05fcbc32;hpb=8308210090225f35709688b59523eedf652e6281;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 0fc161d..b4011c7 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -45,14 +45,13 @@ 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"),
     # 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"),
 ]
 
 
@@ -214,9 +213,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: