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

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index e6fb492..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 --------------------------------------------------------------
 
@@ -165,18 +165,19 @@ class FarmConfig(DefaultConfig):
     require_comment = True
 
     # Authentication
-    from auth.phpbb import PhpbbAuth # This comes from plugin
-    from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname, phpbb_prefix
-    phpbb = PhpbbAuth(
+    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,
-        phpbb_prefix = phpbb_prefix,
-        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