projects
/
matthijs
/
projects
/
wipi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the url_mappings configuration to FarmConfig.
[matthijs/projects/wipi.git]
/
conf
/
farmconfig.py
diff --git
a/conf/farmconfig.py
b/conf/farmconfig.py
index ec0e2c57f9093dd56c484afc0bd7d91ff8644e78..b4011c71a86e0fb99d78355a4b6677183b902ba1 100644
(file)
--- a/
conf/farmconfig.py
+++ b/
conf/farmconfig.py
@@
-45,15
+45,13
@@
wikis = [
# wikiname, url regular expression (no protocol)
# ---------------------------------------------------------------
# wikiname, url regular expression (no protocol)
# ---------------------------------------------------------------
+ ("extinction", r"extinction.evolution-events.nl/wipi"),
("exodus", r"exodus.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
# 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"),
("exodus", r"exodus.evolution-events.nl"),
- ("extinction", r"extinction.evolution-events.nl/wipi"),
]
]
@@
-220,5
+218,10
@@
class FarmConfig(DefaultConfig):
auth = [phpbb]
user_autocreate = True
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:
# vim: set ts=8 sts=4 sw=4 expandtab: