From a4579debe2c4ad40692bcb3dd9ed135af1a30947 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Fri, 26 Mar 2010 20:17:52 +0100 Subject: [PATCH] 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. --- conf/exodus.py | 4 ---- conf/farmconfig.py | 9 +++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/conf/exodus.py b/conf/exodus.py index 60c2545..aaba28a 100644 --- 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 d8f32d6..b4011c7 100644 --- 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: -- 2.30.2