# HG changeset patch # User bsw # Date 1340897018 -7200 # Node ID 3a61d21618f6acb731c0fa85d15c56bdb2257a07 # Parent 0015fa6eb637fa77172ffcc3aa8c9e5ed60d116b Made database configurable diff -r 0015fa6eb637 -r 3a61d21618f6 config/default.lua --- a/config/default.lua Thu Jun 28 17:21:16 2012 +0200 +++ b/config/default.lua Thu Jun 28 17:23:38 2012 +0200 @@ -26,8 +26,13 @@ -- ======================================================================== -- Optional config options +-- Remove leading -- to enable a option -- ======================================================================== +-- Connection information for the LiquidFeedback database +-- ------------------------------------------------------------------------ +-- config.database = { engine='postgresql', dbname='liquid_feedback' } + -- Absolute base url of application -- ------------------------------------------------------------------------ -- config.absolute_base_url = "http://example.com/" diff -r 0015fa6eb637 -r 3a61d21618f6 config/init.lua --- a/config/init.lua Thu Jun 28 17:21:16 2012 +0200 +++ b/config/init.lua Thu Jun 28 17:23:38 2012 +0200 @@ -39,13 +39,14 @@ } end +if not config.database then + config.database = { engine='postgresql', dbname='liquid_feedback' } +end + request.set_404_route{ module = 'index', view = '404' } -- open and set default database handle -db = assert(mondelefant.connect{ - engine='postgresql', - dbname='liquid_feedback' -}) +db = assert(mondelefant.connect(config.database) at_exit(function() db:close() end)