farmconfig: Require a comment on page changes.

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

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index f12dac67d6740c149402546ed23650a81aa302c0..194b49876c50bd32c7d32f603b005e83109fa8cf 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"),
 ]
 
 
@@ -157,13 +157,14 @@ class FarmConfig(DefaultConfig):
     # See /usr/share/doc/$(cdbs_curpkg)/README.Debian for more info
     editor_force = True
     editor_default = 'text'  # internal default, just for completeness
+    # Require a comment on page changes. This needs a patched moinmoin.
+    require_comment = True
 
     # Authentication
     from auth.mysql_login import mysql_login # This comes from plugin
     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,