1.1 --- a/config/example.lua	Tue Mar 24 20:02:30 2015 +0100
     1.2 +++ b/config/example.lua	Tue Mar 24 20:10:51 2015 +0100
     1.3 @@ -53,21 +53,20 @@
     1.4      args = {'-s', 'escape', '-x', 'nofollow,wiki-tables'},
     1.5      remove_images = true
     1.6    },
     1.7 -  { id = "markdown_py",
     1.8 -    name = "Python Markdown",
     1.9 -    executable = "markdown_py",
    1.10 -    args = {'-s', 'escape', '-x', 'extra', '-x', 'nl2br', '-x', 'sane_lists'},
    1.11 -    remove_images = true
    1.12 -  },
    1.13 -  { id = "rocketwiki",
    1.14 -    name = "RocketWiki",
    1.15 -    executable = "/opt/rocketwiki-lqfb/rocketwiki-lqfb"
    1.16 -  },
    1.17 -  { id = "compat",
    1.18 -    name = "Traditional WIKI syntax",
    1.19 -    executable = "/opt/rocketwiki-lqfb/rocketwiki-lqfb-compat"
    1.20 -  },
    1.21 -
    1.22 +--  { id = "markdown_py",
    1.23 +--    name = "Python Markdown",
    1.24 +--    executable = "markdown_py",
    1.25 +--    args = {'-s', 'escape', '-x', 'extra', '-x', 'nl2br', '-x', 'sane_lists'},
    1.26 +--    remove_images = true
    1.27 +--  },
    1.28 +--  { id = "rocketwiki",
    1.29 +--    name = "RocketWiki",
    1.30 +--    executable = "/opt/rocketwiki-lqfb/rocketwiki-lqfb"
    1.31 +--  },
    1.32 +--  { id = "compat",
    1.33 +--    name = "Traditional WIKI syntax",
    1.34 +--    executable = "/opt/rocketwiki-lqfb/rocketwiki-lqfb-compat"
    1.35 +--  },
    1.36  }
    1.37  
    1.38  
    1.39 @@ -104,46 +103,55 @@
    1.40  -- ------------------------------------------------------------------------
    1.41  -- config.disable_registration = true
    1.42  
    1.43 +
    1.44  -- List of enabled languages, defaults to available languages
    1.45  -- ------------------------------------------------------------------------
    1.46  -- config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu', 'it', 'ka', 'nl', 'zh-Hans', 'zh-TW' }
    1.47  
    1.48 +
    1.49  -- Default language, defaults to "en"
    1.50  -- ------------------------------------------------------------------------
    1.51  -- config.default_lang = "en"
    1.52  
    1.53 +
    1.54  -- after how long is a user considered inactive and the trustee will see warning,
    1.55  -- notation is according to postgresql intervals, default: no warning at all
    1.56  -- ------------------------------------------------------------------------
    1.57  -- config.delegation_warning_time = '6 months'
    1.58  
    1.59 +
    1.60  -- after which time a user is advised (_soft) or forced (_hard) to check
    1.61  -- unit and area delegations. default: no check at all
    1.62  -- ------------------------------------------------------------------------
    1.63  -- config.check_delegations_interval_hard = "6 months"
    1.64  -- config.check_delegations_interval_soft = "3 months"
    1.65  
    1.66 +
    1.67  -- default option when checking delegations
    1.68  -- available options: "confirm", "revoke" and "none", default: "confirm"
    1.69  -- ------------------------------------------------------------------------
    1.70  -- config.check_delegations_default = "confirm"
    1.71  
    1.72 +
    1.73  -- Prefix of all automatic mails, defaults to "[Liquid Feedback] "
    1.74  -- ------------------------------------------------------------------------
    1.75  -- config.mail_subject_prefix = "[LiquidFeedback] "
    1.76  
    1.77 +
    1.78  -- Sender of all automatic mails, defaults to system defaults
    1.79  -- ------------------------------------------------------------------------
    1.80  -- config.mail_envelope_from = "liquidfeedback@example.com"
    1.81  -- config.mail_from = { name = "LiquidFeedback", address = "liquidfeedback@example.com" }
    1.82  -- config.mail_reply_to = { name = "Support", address = "support@example.com" }
    1.83  
    1.84 +
    1.85  -- Configuration of password hashing algorithm (defaults to "crypt_sha512")
    1.86  -- ------------------------------------------------------------------------
    1.87  -- config.password_hash_algorithm = "crypt_sha512"
    1.88  -- config.password_hash_algorithm = "crypt_sha256"
    1.89  -- config.password_hash_algorithm = "crypt_md5"
    1.90  
    1.91 +
    1.92  -- Number of rounds for crypt_sha* algorithms, minimum and maximum
    1.93  -- (defaults to minimum 10000 and maximum 20000)
    1.94  -- ------------------------------------------------------------------------
    1.95 @@ -155,14 +163,17 @@
    1.96  -- ------------------------------------------------------------------------
    1.97  -- config.fastpath_url_func = nil
    1.98  
    1.99 +
   1.100  -- Local directory for database dumps offered for download
   1.101  -- ------------------------------------------------------------------------
   1.102  -- config.download_dir = nil
   1.103  
   1.104 +
   1.105  -- Special use terms for database dump download
   1.106  -- ------------------------------------------------------------------------
   1.107  -- config.download_use_terms = "=== Download use terms ===\n"
   1.108  
   1.109 +
   1.110  -- Use custom image conversion, defaults to ImageMagick's convert
   1.111  -- ------------------------------------------------------------------------
   1.112  --config.member_image_content_type = "image/jpeg"
   1.113 @@ -171,20 +182,24 @@
   1.114  --  photo =  function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
   1.115  --}
   1.116  
   1.117 +
   1.118  -- Display a html formatted public message of the day
   1.119  -- ------------------------------------------------------------------------
   1.120  -- config.motd_public = "<h1>Message of the day (public)</h1><p>The MOTD is formatted with HTML</p>"
   1.121  
   1.122 +
   1.123  -- Display a html formatted internal message of the day
   1.124  -- ------------------------------------------------------------------------
   1.125  -- config.motd_intern = "<h1>Message of the day (intern)</h1><p>The MOTD is formatted with HTML</p>"
   1.126  
   1.127 +
   1.128  -- Automatic issue related discussion URL
   1.129  -- ------------------------------------------------------------------------
   1.130  -- config.issue_discussion_url_func = function(issue)
   1.131  --   return "http://example.com/discussion/issue_" .. tostring(issue.id)
   1.132  -- end
   1.133  
   1.134 +
   1.135  -- Integration of Etherpad, disabled by default
   1.136  -- ------------------------------------------------------------------------
   1.137  --config.etherpad = {
   1.138 @@ -195,6 +210,7 @@
   1.139  --  cookie_path = "/"
   1.140  --}
   1.141  
   1.142 +
   1.143  -- Free timings
   1.144  -- ------------------------------------------------------------------------
   1.145  -- This example expects a date string entered in the free timing field
   1.146 @@ -238,6 +254,7 @@
   1.147    end
   1.148  }
   1.149  
   1.150 +
   1.151  -- Admin logger
   1.152  -- ------------------------------------------------------------------------
   1.153  -- Logging administrative activities
   1.154 @@ -256,6 +273,58 @@
   1.155  --]]
   1.156  
   1.157  
   1.158 +-- Network interface to bind to
   1.159 +-- ------------------------------------------------------------------------
   1.160 +-- Available options:
   1.161 +-- true: bind to localhost (default)
   1.162 +-- false: bind to all interface
   1.163 +-- ------------------------------------------------------------------------
   1.164 +-- config.localhost = true
   1.165 +
   1.166 +
   1.167 +-- Network port to bind to
   1.168 +-- ------------------------------------------------------------------------
   1.169 +-- config.port = 8080
   1.170 +
   1.171 +
   1.172 +-- Serving content via IPV6
   1.173 +-- ------------------------------------------------------------------------
   1.174 +-- Available options:
   1.175 +-- nil or false: do not serve via IPv6 (default)
   1.176 +-- true: serve via IPv6
   1.177 +-- ------------------------------------------------------------------------
   1.178 +-- config.ipv6 = false
   1.179 +
   1.180 +
   1.181 +-- Application server fork configuration
   1.182 +-- ------------------------------------------------------------------------
   1.183 +-- config.fork = {
   1.184 +--   pre = 2,            -- desired number of spare (idle) processes
   1.185 +--   min = 4,            -- minimum number of processes
   1.186 +--   max = 128,          -- maximum number of processes (hard limit)
   1.187 +--   delay = 0.125,      -- delay (seconds) between creation of spare processes
   1.188 +--   error_delay = 2,    -- delay (seconds) before retry of failed process creation
   1.189 +--   exit_delay = 2,     -- delay (seconds) between destruction of excessive spare processes
   1.190 +--   idle_timeout = 900, -- idle time (seconds) after a fork gets terminated (0 for no timeout)
   1.191 +--   memory_limit = 0,   -- maximum memory consumption (bytes) before process gets terminated
   1.192 +--   min_requests = 50,  -- minimum count of requests handled before fork is terminated
   1.193 +--   max_requests = 100  -- maximum count of requests handled before fork is terminated
   1.194 +-- }
   1.195 +
   1.196 +
   1.197 +-- HTTP server options
   1.198 +-- ------------------------------------------------------------------------
   1.199 +-- http_options = {
   1.200 +--   static_headers            = {}            -- string or table of static headers to be returned with every request
   1.201 +--   request_header_size_limit = 1024*1024,    -- maximum size of request body sent by client
   1.202 +--   request_body_size_limit   = 64*1024*1024, -- maximum size of request body sent by client
   1.203 +--   request_header_timeout    = 360,          -- time after which request headers must have been received and processed
   1.204 +--   timeout                   = 1800,         -- time in which request body and response must be sent
   1.205 +--   maximum_input_chunk_size  = 16384         -- tweaks behavior of request-body parser
   1.206 +--   minimum_output_chunk_size = 1024          -- chunk size for chunked-transfer-encoding
   1.207 +-- }
   1.208 +
   1.209 +
   1.210  -- WebMCP accelerator
   1.211  -- uncomment the following two lines to use C implementations of chosen
   1.212  -- functions and to disable garbage collection during the request, to