X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=de72c1ab785b572a1f89ff6d7a5ec46abd78e22a;hb=56c7185a2b300c7db7c4e0cdb0f9a5149e46b595;hp=194b49876c50bd32c7d32f603b005e83109fa8cf;hpb=10986f0ff85358afe00bb01b03241ba90529ee42;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 194b498..de72c1a 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -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"Evolution Events - Algemeen Bestuur: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
 
@@ -161,17 +165,19 @@ class FarmConfig(DefaultConfig):
     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',
-        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