farmconfig: Include http:// in wiki urls.

[matthijs/projects/wipi.git] / conf / farmconfig.py

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index f12dac67d6740c149402546ed23650a81aa302c0..ea8baa6f2f8e450fb97a07479f4af00c4b56040c 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -37,15 +37,15 @@ wikis = [
 
     # wikiname,     url regular expression (no protocol)
     # ---------------------------------------------------------------
-    ("extinction", r"extinction.evolution-events.nl/wipi"),
-    ("exodus", r"exodus.evolution-events.nl/wipi"),
-    ("deadfoxjunction", r"deadfoxjunction.evolution-events.nl/wipi"),
+    ("extinction", r"http://extinction.evolution-events.nl/wipi"),
+    ("exodus", r"http://exodus.evolution-events.nl/wipi"),
+    ("deadfoxjunction", r"http://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 setting below all links
     # still work too!
-    ("exodus", r"exodus.evolution-events.nl"),
-    ("deadfoxjunction", r"deadfoxjunction.evolution-events.nl"),
+    ("exodus", r"http://exodus.evolution-events.nl"),
+    ("deadfoxjunction", r"http://deadfoxjunction.evolution-events.nl"),
 ]
 
 
@@ -163,7 +163,6 @@ class FarmConfig(DefaultConfig):
     from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname
     phpbb = mysql_login(
         name    = 'phpbb',
-        verbose = True,
         dbhost  = phpbb_dbhost,
         dbuser  = phpbb_dbuser,
         dbpass  = phpbb_dbpass,