From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Tue, 29 Jun 2010 07:53:54 +0000 (+0200)
Subject: config: Put phpbb_prefix in dbsettings.py.
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fwipi.git;a=commitdiff_plain;h=46eedb7d496c1a24b4a5cb0c0fb59ef142f61588

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 bb08261..8c9b4ea 100644
--- 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 98eccab..e6fb492 100644
--- 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]