config: Put phpbb_prefix in dbsettings.py.

Previously, it was hardcoded in farmconfig.py.

diff --git a/conf/dbsettings.py.tmpl b/conf/dbsettings.py.tmpl
index bb08261d611c33d2dcdbe667895f859180beffd8..8c9b4ea767f63581ae0904d15017d08c86347ad3 100644 (file)
--- a/conf/dbsettings.py.tmpl
+++ b/conf/dbsettings.py.tmpl
@@ -2,3 +2,4 @@ phpbb_dbhost  = ''
 phpbb_dbuser  = ''
 phpbb_dbpass  = ''
 phpbb_dbname  = ''
+phpbb_prefix  = ''

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 98eccab6da50f8f1710efb7e15243313ff889f2f..e6fb492f52c3cfd80f28641c145bc5f837556c90 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -166,14 +166,14 @@ class FarmConfig(DefaultConfig):
 
     # Authentication
     from auth.phpbb import PhpbbAuth # This comes from plugin
-    from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname
+    from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname, phpbb_prefix
     phpbb = PhpbbAuth(
         name    = 'phpbb',
         dbhost  = phpbb_dbhost,
         dbuser  = phpbb_dbuser,
         dbpass  = phpbb_dbpass,
         dbname  = phpbb_dbname,
-        phpbb_prefix = 'lex_',
+        phpbb_prefix = phpbb_prefix,
         hint    = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
     )
     auth = [phpbb]