diff --git a/README.MD b/README.MD index 8a7dbbc..531322d 100644 --- a/README.MD +++ b/README.MD @@ -11,6 +11,9 @@ You can deploy test instance using `Vagrantfile` attached to the role. Then you can access etherpad from your computer on http://192.168.33.8:9001 +## Playbook +The playbook includes mariadb role and deploys entire stack needed to run Etherpad-lite. Additional role is also available in the Ansible roles repos in git. + ## CHANGELOG - **26.03.2021** - Bumped version to 1.8.13 and enable ep_adminpads2 diff --git a/defaults/main.yml b/defaults/main.yml index 5390ba9..692552a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- -etherpad_version: '1.8.14' +etherpad_version: '1.8.16' etherpad_skin: 'colibris' etherpad_skinVariants: 'super-light-toolbar super-light-editor light-background' etherpad_username: 'etherpad' @@ -42,6 +42,7 @@ etherpad_ratelimit_duration: '1' etherpad_ratelimit_points: '100' etherpad_loglevel: 'INFO' etherpad_logfile: '/var/log/etherpad-lite.log' +etherpad_dumpOnUncleanExit: 'false' etherpad_error_log_recipient: 'support@example.com' etherpad_smtp_host: 'localhost' etherpad_smtp_port: '587' diff --git a/templates/var/www/etherpad-lite/settings.json.j2 b/templates/var/www/etherpad-lite/settings.json.j2 index 0854745..3d66218 100644 --- a/templates/var/www/etherpad-lite/settings.json.j2 +++ b/templates/var/www/etherpad-lite/settings.json.j2 @@ -96,8 +96,10 @@ "title": "{{ etherpad_instance_name }}", /* - * favicon default name - * alternatively, set up a fully specified Url to your own favicon + * Pathname of the favicon you want to use. If null, the skin's favicon is + * used if one is provided by the skin, otherwise the default Etherpad favicon + * is used. If this is a relative path it is interpreted as relative to the + * Etherpad root directory. */ "favicon": "favicon.ico", @@ -507,6 +509,11 @@ */ "loadTest": false, + /** + * Disable dump of objects preventing a clean exit + */ + "dumpOnUncleanExit": {{ etherpad_dumpOnUncleanExit }}, + /* * Disable indentation on new line when previous line ends with some special * chars (':', '[', '(', '{') @@ -597,58 +604,6 @@ */ "loglevel": "{{ etherpad_loglevel }}", - /* - * Logging configuration. See log4js documentation for further information: - * https://github.com/nomiddlename/log4js-node - * - * You can add as many appenders as you want here. - */ - "logconfig" : - { "appenders": [ - { "type": "console" - //, "category": "access"// only logs pad access - } - - /* - , { "type": "file" - , "filename": "{{ etherpad_logfile }}" - , "maxLogSize": 1024 - , "backups": 3 // how many log files there're gonna be at max - //, "category": "test" // only log a specific category - } - */ - - /* - , { "type": "logLevelFilter" - , "level": "warn" // filters out all log messages that have a lower level than "error" - , "appender": - { Use whatever appender you want here } - } - */ - - /* - , { "type": "logLevelFilter" - , "level": "error" // filters out all log messages that have a lower level than "error" - , "appender": - { "type": "smtp" - , "subject": "An error occurred in your EPL instance!" - , "recipients": "{{ etherpad_error_log_recipient }}" - , "sendInterval": 300 // 60 * 5 = 5 minutes -- will buffer log messages; set to 0 to send a mail for every message - , "transport": "SMTP", "SMTP": { // see https://github.com/andris9/Nodemailer#possible-transport-methods - "host": "{{ etherpad_smtp_host }}", "port": {{ etherpad_smtp_port }}, - "secureConnection": true, - "auth": { - "user": "{{ etherpad_smtp_user }}", - "pass": "{{ etherpad_smtp_pass }}" - } - } - } - } - */ - - ] - }, // logconfig - /* Override any strings found in locale directories */ "customLocaleStrings": {},