X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=ea8baa6f2f8e450fb97a07479f4af00c4b56040c;hb=a1d0689d8788088fa8f4356fbafca6c415ce79a2;hp=f12dac67d6740c149402546ed23650a81aa302c0;hpb=0beb2436f9cf59b5d0767f3e04f3e3df8cc63879;p=matthijs%2Fprojects%2Fwipi.git diff --git a/conf/farmconfig.py b/conf/farmconfig.py index f12dac6..ea8baa6 100644 --- 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,