X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=57511d02681438f267b944d9ca2032ecdb21bda2;hb=7c0a007a9220cff51fc3106452631a6ed7b21644;hp=3ad8251eafd6b9b873548dec4a0516e312e876d8;hpb=212e4b7e56012b4a04df1f1e9180b9c521aaead1;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 3ad8251..57511d0 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"),
 ]
 
 
@@ -128,9 +128,10 @@ class FarmConfig(DefaultConfig):
         u'HelpContents',
     ]
 
-    # The default theme anonymous or new users get
-    theme_default = 'modern'
-
+    # Always use the proxy. Specific configs define a proxy_theme_mapping,
+    # which maps specific paths to a corresponding theme.
+    theme_default = 'proxy'
+    theme_force = True
 
     # Language options --------------------------------------------------
 
@@ -145,6 +146,9 @@ class FarmConfig(DefaultConfig):
 
     # Content options ---------------------------------------------------
 
+    # name of entry page
+    page_front_page = u"Start"
+
     # Show users hostnames in RecentChanges
     show_hosts = 1
 
@@ -157,16 +161,19 @@ 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 auth.phpbb_login import phpbb_login # This comes from plugin
     from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname
-    phpbb = mysql_login(
+    phpbb = phpbb_login(
         name    = 'phpbb',
         dbhost  = phpbb_dbhost,
         dbuser  = phpbb_dbuser,
         dbpass  = phpbb_dbpass,
         dbname  = phpbb_dbname,
+        phpbb_prefix = 'lex_',
         hint    = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
     )
     auth = [phpbb]