liquid_feedback_frontend
changeset 737:0946d848a3f4
Instance name and database are mandatory in example config now
author | bsw |
---|---|
date | Thu Jun 28 22:07:56 2012 +0200 (2012-06-28) |
parents | e642bf111347 |
children | 0541c9e50ff6 |
files | config/example.lua config/init.lua |
line diff
1.1 --- a/config/example.lua Thu Jun 28 18:36:47 2012 +0200 1.2 +++ b/config/example.lua Thu Jun 28 22:07:56 2012 +0200 1.3 @@ -1,5 +1,5 @@ 1.4 -- ======================================================================== 1.5 --- MANDATORY CONFIG OPTIONS (MUST BE SET!) 1.6 +-- MANDATORY (MUST BE SET!) 1.7 -- ======================================================================== 1.8 1.9 -- Information about service provider (HTML) 1.10 @@ -32,22 +32,23 @@ 1.11 compat = "/opt/rocketwiki-lqfb/rocketwiki-lqfb-compat" 1.12 } 1.13 1.14 --- ======================================================================== 1.15 --- Optional config options 1.16 --- Remove leading -- to enable a option 1.17 --- ======================================================================== 1.18 +-- Absolute base url of application 1.19 +-- ------------------------------------------------------------------------ 1.20 +config.absolute_base_url = "http://example.com/" 1.21 1.22 -- Name of this instance, defaults to name of config file 1.23 -- ------------------------------------------------------------------------ 1.24 --- config.instance_name = "Instance name" 1.25 +config.instance_name = "Instance name" 1.26 1.27 -- Connection information for the LiquidFeedback database 1.28 -- ------------------------------------------------------------------------ 1.29 --- config.database = { engine='postgresql', dbname='liquid_feedback' } 1.30 +config.database = { engine='postgresql', dbname='liquid_feedback' } 1.31 + 1.32 1.33 --- Absolute base url of application 1.34 --- ------------------------------------------------------------------------ 1.35 --- config.absolute_base_url = "http://example.com/" 1.36 +-- ======================================================================== 1.37 +-- OPTIONAL 1.38 +-- Remove leading -- to use a option 1.39 +-- ======================================================================== 1.40 1.41 -- List of enabled languages, defaults to available languages 1.42 -- ------------------------------------------------------------------------
2.1 --- a/config/init.lua Thu Jun 28 18:36:47 2012 +0200 2.2 +++ b/config/init.lua Thu Jun 28 22:07:56 2012 +0200 2.3 @@ -6,10 +6,6 @@ 2.4 2.5 config.app_version = "2.beta12" 2.6 2.7 -if not config.instance_name then 2.8 - config.instance_name = request.get_config_name() 2.9 -end 2.10 - 2.11 if 2.12 not config.app_service_provider or 2.13 not config.use_terms or