# HG changeset patch
# User bsw
# Date 1340914076 -7200
# Node ID 0946d848a3f49942d436eb518ba6d3c76f124804
# Parent  e642bf11134725380751257c27263ddcc22fa0a0
Instance name and database are mandatory in example config now

diff -r e642bf111347 -r 0946d848a3f4 config/example.lua
--- a/config/example.lua	Thu Jun 28 18:36:47 2012 +0200
+++ b/config/example.lua	Thu Jun 28 22:07:56 2012 +0200
@@ -1,5 +1,5 @@
 -- ========================================================================
--- MANDATORY CONFIG OPTIONS (MUST BE SET!)
+-- MANDATORY (MUST BE SET!)
 -- ========================================================================
 
 -- Information about service provider (HTML)
@@ -32,22 +32,23 @@
   compat = "/opt/rocketwiki-lqfb/rocketwiki-lqfb-compat"
 }
 
--- ========================================================================
--- Optional config options
--- Remove leading -- to enable a option
--- ========================================================================
+-- Absolute base url of application
+-- ------------------------------------------------------------------------
+config.absolute_base_url = "http://example.com/"
 
 -- Name of this instance, defaults to name of config file
 -- ------------------------------------------------------------------------
--- config.instance_name = "Instance name"
+config.instance_name = "Instance name"
 
 -- Connection information for the LiquidFeedback database
 -- ------------------------------------------------------------------------
--- config.database = { engine='postgresql', dbname='liquid_feedback' }
+config.database = { engine='postgresql', dbname='liquid_feedback' }
+
 
--- Absolute base url of application
--- ------------------------------------------------------------------------
--- config.absolute_base_url = "http://example.com/"
+-- ========================================================================
+-- OPTIONAL
+-- Remove leading -- to use a option
+-- ========================================================================
 
 -- List of enabled languages, defaults to available languages
 -- ------------------------------------------------------------------------
diff -r e642bf111347 -r 0946d848a3f4 config/init.lua
--- a/config/init.lua	Thu Jun 28 18:36:47 2012 +0200
+++ b/config/init.lua	Thu Jun 28 22:07:56 2012 +0200
@@ -6,10 +6,6 @@
 
 config.app_version = "2.beta12"
 
-if not config.instance_name then
-  config.instance_name = request.get_config_name()
-end
-
 if
   not config.app_service_provider or
   not config.use_terms or