1.1 --- a/config/example.lua	Mon Feb 15 15:31:12 2021 +0100
     1.2 +++ b/config/example.lua	Sun Feb 28 12:22:36 2021 +0100
     1.3 @@ -2,20 +2,21 @@
     1.4  -- MANDATORY (MUST BE CAREFULLY CHECKED AND PROPERLY SET!)
     1.5  -- ========================================================================
     1.6  
     1.7 +-- Absolute base url of application
     1.8 +-- ------------------------------------------------------------------------
     1.9 +config.absolute_base_url = "https://example.org/"
    1.10 +
    1.11 +-- Connection information for the LiquidFeedback database
    1.12 +-- ------------------------------------------------------------------------
    1.13 +config.database = { engine='postgresql', dbname='liquid_feedback' }
    1.14 +
    1.15  -- Name of this instance, defaults to name of config file
    1.16  -- ------------------------------------------------------------------------
    1.17  config.instance_name = "Example Organisation"
    1.18  
    1.19 -
    1.20 --- Connection information for the LiquidFeedback database
    1.21 +-- Information about service provider (HTML)
    1.22  -- ------------------------------------------------------------------------
    1.23 -config.database = { engine='postgresql', dbname='liquid_feedback' }
    1.24 -
    1.25 -
    1.26 --- Absolute base url of application
    1.27 --- ------------------------------------------------------------------------
    1.28 -config.absolute_base_url = "https://example.org/"
    1.29 -
    1.30 +config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
    1.31  
    1.32  -- Network interface to bind to
    1.33  -- ------------------------------------------------------------------------
    1.34 @@ -25,12 +26,10 @@
    1.35  -- ------------------------------------------------------------------------
    1.36  -- config.localhost = true
    1.37  
    1.38 -
    1.39  -- Network port to bind to, default port 8080
    1.40  -- ------------------------------------------------------------------------
    1.41  -- config.port = 8080
    1.42  
    1.43 -
    1.44  -- Serving content via IPV6
    1.45  -- ------------------------------------------------------------------------
    1.46  -- Available options:
    1.47 @@ -39,11 +38,15 @@
    1.48  -- ------------------------------------------------------------------------
    1.49  -- config.ipv6 = false
    1.50  
    1.51 +-- ========================================================================
    1.52 +-- OPTIONAL
    1.53 +-- Remove leading -- to use a option
    1.54 +-- ========================================================================
    1.55  
    1.56  -- Public access level
    1.57  -- ------------------------------------------------------------------------
    1.58  -- Available options:
    1.59 --- "none" 
    1.60 +-- "none" (default)
    1.61  --     -> Closed user group, no public access at all
    1.62  --        (except login/registration/password reset)
    1.63  -- "anonymous"
    1.64 @@ -56,30 +59,16 @@
    1.65  -- "everything"
    1.66  --     -> Show everything a member can see, including profile pages
    1.67  -- ------------------------------------------------------------------------
    1.68 -config.public_access = "none"
    1.69 -
    1.70 -
    1.71 --- Information about service provider (HTML)
    1.72 --- ------------------------------------------------------------------------
    1.73 -config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
    1.74 -
    1.75 -
    1.76 -
    1.77 --- ========================================================================
    1.78 --- OPTIONAL
    1.79 --- Remove leading -- to use a option
    1.80 --- ========================================================================
    1.81 +-- config.public_access = "none"
    1.82  
    1.83  -- List of enabled languages, defaults to available languages
    1.84  -- ------------------------------------------------------------------------
    1.85  -- config.enabled_languages = { 'en', 'de', 'eo', 'el', 'hu', 'it', 'ka', 'nl', 'zh-Hans', 'zh-TW' }
    1.86  
    1.87 -
    1.88  -- Default language, defaults to "en"
    1.89  -- ------------------------------------------------------------------------
    1.90  -- config.default_lang = "en"
    1.91  
    1.92 -
    1.93  -- Disable registration
    1.94  -- ------------------------------------------------------------------------
    1.95  -- Available options:
    1.96 @@ -88,12 +77,10 @@
    1.97  -- ------------------------------------------------------------------------
    1.98  -- config.disable_registration = true
    1.99  
   1.100 -
   1.101  -- A HTML formatted text the user has to accept while registering
   1.102  -- ------------------------------------------------------------------------
   1.103  -- config.use_terms = "<h1>Terms of Use</h1><p>Insert terms here</p>"
   1.104  
   1.105 -
   1.106  -- Checkbox(es) the user has to accept while registering
   1.107  -- ------------------------------------------------------------------------
   1.108  -- config.use_terms_checkboxes = {
   1.109 @@ -114,32 +101,27 @@
   1.110  -- ------------------------------------------------------------------------
   1.111  -- config.delegation_warning_time = '6 months'
   1.112  
   1.113 -
   1.114  -- after which time a user is advised (_soft) or forced (_hard) to check
   1.115  -- unit and area delegations. default: no check at all
   1.116  -- ------------------------------------------------------------------------
   1.117  -- config.check_delegations_interval_soft = "3 months"
   1.118  -- config.check_delegations_interval_hard = "6 months"
   1.119  
   1.120 -
   1.121  -- default option when checking delegations
   1.122  -- available options: "confirm", "revoke" and "none", default: "confirm"
   1.123  -- ------------------------------------------------------------------------
   1.124  -- config.check_delegations_default = "confirm"
   1.125  
   1.126 -
   1.127  -- Prefix of all automatic mails, defaults to "[Liquid Feedback] "
   1.128  -- ------------------------------------------------------------------------
   1.129  -- config.mail_subject_prefix = "[LiquidFeedback] "
   1.130  
   1.131 -
   1.132  -- Sender of all automatic mails, defaults to system defaults
   1.133  -- ------------------------------------------------------------------------
   1.134  -- config.mail_envelope_from = "liquidfeedback@example.com"
   1.135  -- config.mail_from = { name = "LiquidFeedback", address = "liquidfeedback@example.com" }
   1.136  -- config.mail_reply_to = { name = "Support", address = "support@example.com" }
   1.137  
   1.138 -
   1.139  -- Template for digest emails
   1.140  -- #{name} will be replaced by member screen name
   1.141  -- #{digest} will be replaced with the digest content
   1.142 @@ -152,31 +134,26 @@
   1.143  -- #{digest}
   1.144  -- ]]
   1.145  
   1.146 -
   1.147  -- Configuration of password hashing algorithm (defaults to "crypt_sha512")
   1.148  -- ------------------------------------------------------------------------
   1.149  -- config.password_hash_algorithm = "crypt_sha512"
   1.150  -- config.password_hash_algorithm = "crypt_sha256"
   1.151  -- config.password_hash_algorithm = "crypt_md5"
   1.152  
   1.153 -
   1.154  -- Number of rounds for crypt_sha* algorithms, minimum and maximum
   1.155  -- (defaults to minimum 10000 and maximum 20000)
   1.156  -- ------------------------------------------------------------------------
   1.157  -- config.password_hash_min_rounds = 10000
   1.158  -- config.password_hash_max_rounds = 20000
   1.159  
   1.160 -
   1.161  -- Local directory for database dumps offered for download
   1.162  -- ------------------------------------------------------------------------
   1.163  -- config.download_dir = nil
   1.164  
   1.165 -
   1.166  -- Special use terms for database dump download
   1.167  -- ------------------------------------------------------------------------
   1.168  -- config.download_use_terms = "=== Download use terms ===\n"
   1.169  
   1.170 -
   1.171  -- Use custom image conversion, defaults to ImageMagick's convert
   1.172  -- ------------------------------------------------------------------------
   1.173  --config.member_image_content_type = "image/jpeg"
   1.174 @@ -210,19 +187,14 @@
   1.175  -- ------------------------------------------------------------------------
   1.176  -- config.member_profile_fields = {}
   1.177  
   1.178 -
   1.179 -
   1.180  -- Display a html formatted public message of the day
   1.181  -- ------------------------------------------------------------------------
   1.182  -- config.motd_public = "<h1>Message of the day (public)</h1><p>The MOTD is formatted with HTML</p>"
   1.183  
   1.184 -
   1.185  -- Display a html formatted internal message of the day
   1.186  -- ------------------------------------------------------------------------
   1.187  -- config.motd_intern = "<h1>Message of the day (intern)</h1><p>The MOTD is formatted with HTML</p>"
   1.188  
   1.189 -
   1.190 -
   1.191  -- Free timings
   1.192  -- ------------------------------------------------------------------------
   1.193  -- This example expects a date string entered in the free timing field
   1.194 @@ -268,7 +240,6 @@
   1.195  }
   1.196  --]]
   1.197  
   1.198 -
   1.199  -- External references
   1.200  -- ------------------------------------------------------------------------
   1.201  -- Rendering of external references
   1.202 @@ -288,7 +259,6 @@
   1.203  end
   1.204  --]]
   1.205  
   1.206 -
   1.207  -- Configuration of OAuth2 service, defaults to OAuth2 disabled
   1.208  -- ------------------------------------------------------------------------
   1.209  -- config.oauth2 = {}
   1.210 @@ -311,8 +281,6 @@
   1.211  -- config.oauth2.refresh_grace_period = 60
   1.212  -- config.oauth2.access_token_lifetime = 60 * 60
   1.213  
   1.214 -
   1.215 -
   1.216  -- Admin logger
   1.217  -- ------------------------------------------------------------------------
   1.218  -- Logging administrative activities
   1.219 @@ -325,9 +293,6 @@
   1.220  --   -- do something (e.g. calling 'logger' via extos.pfilter)
   1.221  -- end
   1.222  
   1.223 -
   1.224 -
   1.225 -
   1.226  -- Application server fork configuration
   1.227  -- ------------------------------------------------------------------------
   1.228  -- config.fork = {
   1.229 @@ -343,7 +308,6 @@
   1.230  --   max_requests = 100  -- maximum count of requests handled before fork is terminated
   1.231  -- }
   1.232  
   1.233 -
   1.234  -- HTTP server options
   1.235  -- ------------------------------------------------------------------------
   1.236  -- http_options = {
   1.237 @@ -358,7 +322,6 @@
   1.238  --   minimum_output_chunk_size = 1024          -- chunk size for chunked-transfer-encoding
   1.239  -- }
   1.240  
   1.241 -
   1.242  -- WebMCP accelerator
   1.243  -- ------------------------------------------------------------------------
   1.244  -- uncomment the following line to use C implementations of chosen
   1.245 @@ -366,20 +329,17 @@
   1.246  -- ------------------------------------------------------------------------
   1.247  -- require 'webmcp_accelerator'
   1.248  
   1.249 -
   1.250  -- Trace debug
   1.251  -- ------------------------------------------------------------------------
   1.252  -- uncomment the following line to enable debug trace
   1.253  -- ------------------------------------------------------------------------
   1.254  -- config.enable_debug_trace = true
   1.255  
   1.256 -
   1.257  -- Configuration of lf4rcs, disabled by default
   1.258  -- for example configration see _lf4rcs.lua
   1.259  -- ------------------------------------------------------------------------
   1.260  -- execute.config("_lf4rcs")
   1.261  
   1.262 -
   1.263  -- Configuration of ldap authentication, disabled by default
   1.264  -- for example configration, see _ldap.lua
   1.265  -- for active directory example, see _ldap_ad.lua
   1.266 @@ -387,7 +347,6 @@
   1.267  -- execute.config("_ldap")
   1.268  -- execute.config("_ldap_ad")
   1.269  
   1.270 -
   1.271  -- Integration of Etherpad, disabled by default
   1.272  -- ------------------------------------------------------------------------
   1.273  --config.etherpad = {
   1.274 @@ -409,4 +368,3 @@
   1.275  config.allow_new_draft_callback = true
   1.276  --]]
   1.277  
   1.278 -