Move the url_mappings configuration to FarmConfig.

This enables the use of /Site instead of /wipi/Site for all wipis. This
is not used for extinction yet, but will be used for more wipis in the
future.

diff --git a/conf/exodus.py b/conf/exodus.py
index 60c2545558a1e2dbfe7e91012e349ab8ba0a5989..aaba28a8c56694ccb00a4be507f43245a9230eeb 100644 (file)
--- a/conf/exodus.py
+++ b/conf/exodus.py
@@ -37,10 +37,6 @@ class Config(FarmConfig):
 
     theme_default = 'exodus'
      
-    # All urls that would be generated below /wipi/Site can be pointed to
-    # /Site instead, since lighttpd maps /Site to the wipi as well.
-    url_mappings = {'/wipi/Site' : '/Site'}
-
     # Set cookies on /, so they work on /wipi and /Site alike.
     cookie_path = '/'
 

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index d8f32d68df790c59e8210497227adfb4c5e29b6a..b4011c71a86e0fb99d78355a4b6677183b902ba1 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -49,8 +49,8 @@ wikis = [
     ("exodus", r"exodus.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!
+    # script-name by lighttpd and the url_mappings setting below all links
+    # still work too!
     ("exodus", r"exodus.evolution-events.nl"),
 ]
 
@@ -218,5 +218,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: