phpbb: Restructure to make PhpbbAuth and PhpbbGroupsBackend more equal.

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

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 5d3e8a31ae20ed286b50b45c6d4a71f2bd27cee8..c17bb474c977991e01e20f2b9d997f117be411f5 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -165,19 +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,
+        dbhost  = dbsettings.phpbb_dbhost,
+        dbuser  = dbsettings.phpbb_dbuser,
+        dbpass  = dbsettings.phpbb_dbpass,
+        dbname  = dbsettings.phpbb_dbname,
+        phpbb_prefix = dbsettings.phpbb_prefix,
         hint    = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
     )
-    auth = [phpbb]
-    groups = phpbb.groups_backend
+    auth = [phpbb_auth]
+    groups = phpbb_groups
 
     user_autocreate = True