1.1 --- a/config/default.lua	Thu Jun 28 17:07:00 2012 +0200
     1.2 +++ b/config/default.lua	Thu Jun 28 17:08:52 2012 +0200
     1.3 @@ -1,25 +1,28 @@
     1.4 ----------------------------------------------------------------------------
     1.5 +-- ========================================================================
     1.6  -- Include defaults (DO NOT REMOVE THIS SECTION)
     1.7 ----------------------------------------------------------------------------
     1.8 +-- ========================================================================
     1.9 +
    1.10  execute.config("defaults")
    1.11  
    1.12 ----------------------------------------------------------------------------
    1.13 +
    1.14 +-- ========================================================================
    1.15  -- MANDATORY CONFIG OPTIONS
    1.16 ----------------------------------------------------------------------------
    1.17 +-- ========================================================================
    1.18  
    1.19  -- Name of this instance, defaults to name of config file
    1.20 +-- ------------------------------------------------------------------------
    1.21  -- config.instance_name = "Instance name"
    1.22  
    1.23  -- Information about service provider
    1.24 ----------------------------------------------------------------------------
    1.25 +-- ------------------------------------------------------------------------
    1.26  config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
    1.27  
    1.28  -- A rocketwiki formatted text the user has to accept while registering
    1.29 ----------------------------------------------------------------------------
    1.30 +-- ------------------------------------------------------------------------
    1.31  config.use_terms = "=== Terms of Use ==="
    1.32  
    1.33  -- Checkbox(es) the user has to accept while registering
    1.34 ----------------------------------------------------------------------------
    1.35 +-- ------------------------------------------------------------------------
    1.36  config.use_terms_checkboxes = {
    1.37    {
    1.38      name = "terms_of_use_v1",
    1.39 @@ -28,49 +31,50 @@
    1.40    }
    1.41  }
    1.42  
    1.43 ----------------------------------------------------------------------------
    1.44 +
    1.45 +-- ========================================================================
    1.46  -- Optional config options
    1.47 ----------------------------------------------------------------------------
    1.48 +-- ========================================================================
    1.49  
    1.50  -- List of enabled languages, defaults to available languages
    1.51 ----------------------------------------------------------------------------
    1.52 +-- ------------------------------------------------------------------------
    1.53  -- config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu' }
    1.54  
    1.55  -- Default language, defaults to "en"
    1.56 ----------------------------------------------------------------------------
    1.57 +-- ------------------------------------------------------------------------
    1.58  -- config.default_lang = "en"
    1.59  
    1.60  -- after how long is a user considered inactive and the trustee will see warning
    1.61  -- notation is according to postgresql intervals
    1.62 ----------------------------------------------------------------------------
    1.63 +-- ------------------------------------------------------------------------
    1.64  -- config.delegation_warning_time = '6 months'
    1.65  
    1.66  -- Sender and prefix of all automatic mails, default to "[Liquid Feedback] "
    1.67 ----------------------------------------------------------------------------
    1.68 +-- ------------------------------------------------------------------------
    1.69  -- config.mail_subject_prefix = "[LiquidFeedback] "
    1.70  -- config.mail_envelope_from = "liquid-support@example.com"
    1.71  -- config.mail_from = "LiquidFeedback"
    1.72  -- config.mail_reply_to = "liquid-support@example.com"
    1.73  
    1.74  -- Supply custom url for avatar/photo delivery
    1.75 ----------------------------------------------------------------------------
    1.76 +-- ------------------------------------------------------------------------
    1.77  -- config.fastpath_url_func = nil
    1.78  
    1.79  -- Local directory for database dumps offered for download
    1.80 ----------------------------------------------------------------------------
    1.81 +-- ------------------------------------------------------------------------
    1.82  -- config.download_dir = nil
    1.83  
    1.84  -- Special use terms for database dump download
    1.85 ----------------------------------------------------------------------------
    1.86 +-- ------------------------------------------------------------------------
    1.87  -- config.download_use_terms = "=== Download use terms ===\n"
    1.88  
    1.89  -- Set public access level
    1.90  -- Available options: false, "anonymous", "pseudonym", "full"
    1.91 ----------------------------------------------------------------------------
    1.92 +-- ------------------------------------------------------------------------
    1.93  -- config.public_access = "full"
    1.94  
    1.95  -- Use custom image conversion
    1.96 ----------------------------------------------------------------------------
    1.97 +-- ------------------------------------------------------------------------
    1.98  --config.member_image_content_type = "image/jpeg"
    1.99  --config.member_image_convert_func = {
   1.100  --  avatar = function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail",   "48x48", "jpeg:-") end,
   1.101 @@ -78,7 +82,7 @@
   1.102  --}
   1.103  
   1.104  -- Integration of Etherpad
   1.105 ----------------------------------------------------------------------------
   1.106 +-- ------------------------------------------------------------------------
   1.107  --config.etherpad = {
   1.108  --  base_url = "http://example.com:9001/",
   1.109  --  api_base = "http://localhost:9001/",
   1.110 @@ -88,16 +92,16 @@
   1.111  --}
   1.112  
   1.113  -- WebMCP accelerator
   1.114 ----------------------------------------------------------------------------
   1.115  -- uncomment the following two lines to use C implementations of chosen
   1.116  -- functions and to disable garbage collection during the request, to
   1.117  -- increase speed:
   1.118 ---
   1.119 +-- ------------------------------------------------------------------------
   1.120  -- require 'webmcp_accelerator'
   1.121  -- collectgarbage("stop")
   1.122  
   1.123  
   1.124 ----------------------------------------------------------------------------
   1.125 +-- ========================================================================
   1.126  -- Do main initialisation (DO NOT REMOVE THIS SECTION)
   1.127 ----------------------------------------------------------------------------
   1.128 +-- ========================================================================
   1.129 +
   1.130  execute.config("init")