X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=cf73acdc19fb871c31bbff9792b7e24d72f5e9ca;hb=a9eb15b60aedee63870f727d605362bfe2041952;hp=f12dac67d6740c149402546ed23650a81aa302c0;hpb=0beb2436f9cf59b5d0767f3e04f3e3df8cc63879;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index f12dac6..cf73acd 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"),
 ]
 
 
@@ -105,9 +105,9 @@ class FarmConfig(DefaultConfig):
 
     acl_hierarchic = True
 
-    # Give users all rights, but don't give any rights to anonymous users
+    # Give all rights to the EE group, but no rights to anonymous users.
     acl_rights_default = u""
-    acl_rights_before = u"Known:read,write,delete,revert,admin"
+    acl_rights_before = u"EE:read,write,delete,revert,admin"
 
     # Mail --------------------------------------------------------------
 
@@ -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,20 +161,23 @@ 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(
+    import auth.phpbb
+    import dbsettings
+    (phpbb_auth, phpbb_groups) = auth.phpbb.setup(
         name    = 'phpbb',
-        verbose = True,
-        dbhost  = phpbb_dbhost,
-        dbuser  = phpbb_dbuser,
-        dbpass  = phpbb_dbpass,
-        dbname  = phpbb_dbname,
-        hint    = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
+        dbhost  = dbsettings.phpbb_dbhost,
+        dbuser  = dbsettings.phpbb_dbuser,
+        dbpass  = dbsettings.phpbb_dbpass,
+        dbname  = dbsettings.phpbb_dbname,
+        phpbb_prefix = dbsettings.phpbb_prefix,
+        hint    = "Hier kun je inloggen met je Evolution Events Forum account.  dit is vooral nuttig voor bestuursleden om wijzigingen te maken."
     )
-    auth = [phpbb]
+    auth = [phpbb_auth]
+    groups = phpbb_groups
 
     user_autocreate = True