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

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index ec0e2c5..2eb7622 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -45,15 +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"),
+    # script-name by lighttpd and the url_mappings setting below all links
+    # still work too!
     ("exodus", r"exodus.evolution-events.nl"),
-    ("extinction", r"extinction.evolution-events.nl/wipi"),
+    ("deadfoxjunction", r"deadfoxjunction.evolution-events.nl"),
 ]
 
 
@@ -220,5 +220,10 @@ class FarmConfig(DefaultConfig):
     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: