1.1 --- a/config/default.lua	Thu Jun 28 17:08:52 2012 +0200
     1.2 +++ b/config/default.lua	Thu Jun 28 17:21:16 2012 +0200
     1.3 @@ -1,19 +1,12 @@
     1.4  -- ========================================================================
     1.5 --- Include defaults (DO NOT REMOVE THIS SECTION)
     1.6 --- ========================================================================
     1.7 -
     1.8 -execute.config("defaults")
     1.9 -
    1.10 -
    1.11 --- ========================================================================
    1.12 --- MANDATORY CONFIG OPTIONS
    1.13 +-- MANDATORY CONFIG OPTIONS (MUST BE SET!)
    1.14  -- ========================================================================
    1.15  
    1.16  -- Name of this instance, defaults to name of config file
    1.17  -- ------------------------------------------------------------------------
    1.18 --- config.instance_name = "Instance name"
    1.19 +config.instance_name = "Instance name"
    1.20  
    1.21 --- Information about service provider
    1.22 +-- Information about service provider (HTML)
    1.23  -- ------------------------------------------------------------------------
    1.24  config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
    1.25  
    1.26 @@ -31,11 +24,14 @@
    1.27    }
    1.28  }
    1.29  
    1.30 -
    1.31  -- ========================================================================
    1.32  -- Optional config options
    1.33  -- ========================================================================
    1.34  
    1.35 +-- Absolute base url of application
    1.36 +-- ------------------------------------------------------------------------
    1.37 +-- config.absolute_base_url = "http://example.com/"
    1.38 +
    1.39  -- List of enabled languages, defaults to available languages
    1.40  -- ------------------------------------------------------------------------
    1.41  -- config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu' }

     2.1 --- a/config/defaults.lua	Thu Jun 28 17:08:52 2012 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,39 +0,0 @@
     2.4 -config.app_version = "2.beta12"
     2.5 -
     2.6 -config.instance_name = request.get_config_name()
     2.7 -
     2.8 -config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
     2.9 -
    2.10 -config.use_terms = "=== Terms of Use ==="
    2.11 -
    2.12 -config.use_terms_checkboxes = {
    2.13 -  {
    2.14 -    name = "terms_of_use_v1",
    2.15 -    html = "I accept the terms of use.",
    2.16 -    not_accepted_error = "You have to accept the terms of use to be able to register."
    2.17 -  }
    2.18 -}
    2.19 -
    2.20 -config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu' }
    2.21 -
    2.22 -config.default_lang = "en"
    2.23 -
    2.24 -config.delegation_warning_time = '6 months'
    2.25 -
    2.26 -config.mail_subject_prefix = "[LiquidFeedback] "
    2.27 -
    2.28 -config.fastpath_url_func = nil
    2.29 -
    2.30 -config.download_dir = nil
    2.31 -
    2.32 -config.download_use_terms = "=== Nutzungsbedingungen ===\nAlles ist verboten"
    2.33 -
    2.34 -config.public_access = false
    2.35 -
    2.36 -config.member_image_content_type = "image/jpeg"
    2.37 -
    2.38 -config.member_image_convert_func = {
    2.39 -  avatar = function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail",   "48x48", "jpeg:-") end,
    2.40 -  photo =  function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
    2.41 -}
    2.42 -

     3.1 --- a/config/init.lua	Thu Jun 28 17:08:52 2012 +0200
     3.2 +++ b/config/init.lua	Thu Jun 28 17:21:16 2012 +0200
     3.3 @@ -1,3 +1,44 @@
     3.4 +config.app_version = "2.beta12"
     3.5 +
     3.6 +if not config.instance_name then
     3.7 +  config.instance_name = request.get_config_name()
     3.8 +end
     3.9 +
    3.10 +if
    3.11 +  not config.app_service_provider or
    3.12 +  not config.use_terms or
    3.13 +  not config.use_terms_checkboxes
    3.14 +then
    3.15 +  error("Missing mandatory config option")
    3.16 +end
    3.17 +
    3.18 +if config.enabled_languages == nil then
    3.19 +  config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu' }
    3.20 +end
    3.21 +
    3.22 +if config.default_lang == nil then
    3.23 +  config.default_lang = "en"
    3.24 +end
    3.25 +
    3.26 +if config.mail_subject_prefix == nil then
    3.27 +  config.mail_subject_prefix = "[LiquidFeedback] "
    3.28 +end
    3.29 +
    3.30 +if config.absolute_base_url == nil then
    3.31 +  config.absolute_base_url = request.get_relative_baseurl()
    3.32 +end
    3.33 +
    3.34 +if config.member_image_content_type == nil then
    3.35 +  config.member_image_content_type = "image/jpeg"
    3.36 +end
    3.37 +
    3.38 +if config.member_image_convert_func == nil then
    3.39 +  config.member_image_convert_func = {
    3.40 +    avatar = function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail",   "48x48", "jpeg:-") end,
    3.41 +    photo =  function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
    3.42 +  }
    3.43 +end
    3.44 +
    3.45  request.set_404_route{ module = 'index', view = '404' }
    3.46  
    3.47  -- open and set default database handle