# HG changeset patch
# User bsw
# Date 1340897058 -7200
# Node ID 9c88e513a8f797b2d53b9c0e65d1b1b33bdfbef5
# Parent 3a61d21618f6acb731c0fa85d15c56bdb2257a07
Renamed example config to example.lua
diff -r 3a61d21618f6 -r 9c88e513a8f7 config/default.lua
--- a/config/default.lua Thu Jun 28 17:23:38 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
--- ========================================================================
--- MANDATORY CONFIG OPTIONS (MUST BE SET!)
--- ========================================================================
-
--- Name of this instance, defaults to name of config file
--- ------------------------------------------------------------------------
-config.instance_name = "Instance name"
-
--- Information about service provider (HTML)
--- ------------------------------------------------------------------------
-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",
- html = "I accept the terms of use.",
- not_accepted_error = "You have to accept the terms of use to be able to register."
- }
-}
-
--- ========================================================================
--- Optional config options
--- Remove leading -- to enable a option
--- ========================================================================
-
--- Connection information for the LiquidFeedback database
--- ------------------------------------------------------------------------
--- config.database = { engine='postgresql', dbname='liquid_feedback' }
-
--- 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' }
-
--- 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,
--- photo = function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
---}
-
--- Integration of Etherpad
--- ------------------------------------------------------------------------
---config.etherpad = {
--- base_url = "http://example.com:9001/",
--- api_base = "http://localhost:9001/",
--- api_key = "mysecretapikey",
--- group_id = "mygroupname",
--- cookie_path = "/"
---}
-
--- 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")
diff -r 3a61d21618f6 -r 9c88e513a8f7 config/example.lua
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/config/example.lua Thu Jun 28 17:24:18 2012 +0200
@@ -0,0 +1,108 @@
+-- ========================================================================
+-- MANDATORY CONFIG OPTIONS (MUST BE SET!)
+-- ========================================================================
+
+-- Name of this instance, defaults to name of config file
+-- ------------------------------------------------------------------------
+config.instance_name = "Instance name"
+
+-- Information about service provider (HTML)
+-- ------------------------------------------------------------------------
+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",
+ html = "I accept the terms of use.",
+ not_accepted_error = "You have to accept the terms of use to be able to register."
+ }
+}
+
+-- ========================================================================
+-- Optional config options
+-- Remove leading -- to enable a option
+-- ========================================================================
+
+-- Connection information for the LiquidFeedback database
+-- ------------------------------------------------------------------------
+-- config.database = { engine='postgresql', dbname='liquid_feedback' }
+
+-- 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' }
+
+-- 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,
+-- photo = function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
+--}
+
+-- Integration of Etherpad
+-- ------------------------------------------------------------------------
+--config.etherpad = {
+-- base_url = "http://example.com:9001/",
+-- api_base = "http://localhost:9001/",
+-- api_key = "mysecretapikey",
+-- group_id = "mygroupname",
+-- cookie_path = "/"
+--}
+
+-- 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")