# HG changeset patch
# User bsw
# Date 1340896876 -7200
# Node ID 0015fa6eb637fa77172ffcc3aa8c9e5ed60d116b
# Parent  2496ac5368ade2be19eb742124013c836b74cced
Made config easier

diff -r 2496ac5368ad -r 0015fa6eb637 config/default.lua
--- a/config/default.lua	Thu Jun 28 17:08:52 2012 +0200
+++ b/config/default.lua	Thu Jun 28 17:21:16 2012 +0200
@@ -1,19 +1,12 @@
 -- ========================================================================
--- Include defaults (DO NOT REMOVE THIS SECTION)
--- ========================================================================
-
-execute.config("defaults")
-
-
--- ========================================================================
--- MANDATORY CONFIG OPTIONS
+-- MANDATORY CONFIG OPTIONS (MUST BE SET!)
 -- ========================================================================
 
 -- Name of this instance, defaults to name of config file
 -- ------------------------------------------------------------------------
--- config.instance_name = "Instance name"
+config.instance_name = "Instance name"
 
--- Information about service provider
+-- Information about service provider (HTML)
 -- ------------------------------------------------------------------------
 config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
 
@@ -31,11 +24,14 @@
   }
 }
 
-
 -- ========================================================================
 -- Optional config options
 -- ========================================================================
 
+-- Absolute base url of application
+-- ------------------------------------------------------------------------
+-- config.absolute_base_url = "http://example.com/"
+
 -- List of enabled languages, defaults to available languages
 -- ------------------------------------------------------------------------
 -- config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu' }
diff -r 2496ac5368ad -r 0015fa6eb637 config/defaults.lua
--- a/config/defaults.lua	Thu Jun 28 17:08:52 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-config.app_version = "2.beta12"
-
-config.instance_name = request.get_config_name()
-
-config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
-
-config.use_terms = "=== Terms of Use ==="
-
-config.use_terms_checkboxes = {
-  {
-    name = "terms_of_use_v1",
-    html = "I accept the terms of use.",
-    not_accepted_error = "You have to accept the terms of use to be able to register."
-  }
-}
-
-config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu' }
-
-config.default_lang = "en"
-
-config.delegation_warning_time = '6 months'
-
-config.mail_subject_prefix = "[LiquidFeedback] "
-
-config.fastpath_url_func = nil
-
-config.download_dir = nil
-
-config.download_use_terms = "=== Nutzungsbedingungen ===\nAlles ist verboten"
-
-config.public_access = false
-
-config.member_image_content_type = "image/jpeg"
-
-config.member_image_convert_func = {
-  avatar = function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail",   "48x48", "jpeg:-") end,
-  photo =  function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
-}
-
diff -r 2496ac5368ad -r 0015fa6eb637 config/init.lua
--- a/config/init.lua	Thu Jun 28 17:08:52 2012 +0200
+++ b/config/init.lua	Thu Jun 28 17:21:16 2012 +0200
@@ -1,3 +1,44 @@
+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
+  not config.use_terms_checkboxes
+then
+  error("Missing mandatory config option")
+end
+
+if config.enabled_languages == nil then
+  config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu' }
+end
+
+if config.default_lang == nil then
+  config.default_lang = "en"
+end
+
+if config.mail_subject_prefix == nil then
+  config.mail_subject_prefix = "[LiquidFeedback] "
+end
+
+if config.absolute_base_url == nil then
+  config.absolute_base_url = request.get_relative_baseurl()
+end
+
+if config.member_image_content_type == nil then
+  config.member_image_content_type = "image/jpeg"
+end
+
+if config.member_image_convert_func == nil then
+  config.member_image_convert_func = {
+    avatar = function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail",   "48x48", "jpeg:-") end,
+    photo =  function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
+  }
+end
+
 request.set_404_route{ module = 'index', view = '404' }
 
 -- open and set default database handle