# HG changeset patch
# User bsw
# Date 1340896132 -7200
# Node ID 2496ac5368ade2be19eb742124013c836b74cced
# Parent f52f918b38b881e54db487cc408106c61c5d52d2
Better formatting of config file
diff -r f52f918b38b8 -r 2496ac5368ad config/default.lua
--- a/config/default.lua Thu Jun 28 17:07:00 2012 +0200
+++ b/config/default.lua Thu Jun 28 17:08:52 2012 +0200
@@ -1,25 +1,28 @@
----------------------------------------------------------------------------
+-- ========================================================================
-- Include defaults (DO NOT REMOVE THIS SECTION)
----------------------------------------------------------------------------
+-- ========================================================================
+
execute.config("defaults")
----------------------------------------------------------------------------
+
+-- ========================================================================
-- MANDATORY CONFIG OPTIONS
----------------------------------------------------------------------------
+-- ========================================================================
-- Name of this instance, defaults to name of config file
+-- ------------------------------------------------------------------------
-- config.instance_name = "Instance name"
-- Information about service provider
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
config.app_service_provider = "Snake Oil
10000 Berlin
Germany"
-- A rocketwiki formatted text the user has to accept while registering
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
config.use_terms = "=== Terms of Use ==="
-- Checkbox(es) the user has to accept while registering
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
config.use_terms_checkboxes = {
{
name = "terms_of_use_v1",
@@ -28,49 +31,50 @@
}
}
----------------------------------------------------------------------------
+
+-- ========================================================================
-- Optional config options
----------------------------------------------------------------------------
+-- ========================================================================
-- List of enabled languages, defaults to available languages
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
-- config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu' }
-- Default language, defaults to "en"
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
-- config.default_lang = "en"
-- after how long is a user considered inactive and the trustee will see warning
-- notation is according to postgresql intervals
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
-- config.delegation_warning_time = '6 months'
-- Sender and prefix of all automatic mails, default to "[Liquid Feedback] "
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
-- config.mail_subject_prefix = "[LiquidFeedback] "
-- config.mail_envelope_from = "liquid-support@example.com"
-- config.mail_from = "LiquidFeedback"
-- config.mail_reply_to = "liquid-support@example.com"
-- Supply custom url for avatar/photo delivery
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
-- config.fastpath_url_func = nil
-- Local directory for database dumps offered for download
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
-- config.download_dir = nil
-- Special use terms for database dump download
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
-- config.download_use_terms = "=== Download use terms ===\n"
-- Set public access level
-- Available options: false, "anonymous", "pseudonym", "full"
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
-- config.public_access = "full"
-- Use custom image conversion
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
--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,
@@ -78,7 +82,7 @@
--}
-- Integration of Etherpad
----------------------------------------------------------------------------
+-- ------------------------------------------------------------------------
--config.etherpad = {
-- base_url = "http://example.com:9001/",
-- api_base = "http://localhost:9001/",
@@ -88,16 +92,16 @@
--}
-- WebMCP accelerator
----------------------------------------------------------------------------
-- uncomment the following two lines to use C implementations of chosen
-- functions and to disable garbage collection during the request, to
-- increase speed:
---
+-- ------------------------------------------------------------------------
-- require 'webmcp_accelerator'
-- collectgarbage("stop")
----------------------------------------------------------------------------
+-- ========================================================================
-- Do main initialisation (DO NOT REMOVE THIS SECTION)
----------------------------------------------------------------------------
+-- ========================================================================
+
execute.config("init")