diff --git a/defaults/main.yml b/defaults/main.yml index 6e2c71f..f30ea8f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -74,7 +74,6 @@ etherpad_minify: "true" etherpad_max_age: 21600 etherpad_abiword: "{{ '/usr/bin/abiword' if etherpad_abiword_enabled else 'null' }}" etherpad_soffice: "null" -etherpad_tidyhtml: "null" etherpad_allow_unknown_file_ends: "true" etherpad_require_authentication: "false" etherpad_require_authorization: "false" @@ -110,13 +109,6 @@ etherpad_toolbar: timeslider: - ["timeslider_export", "timeslider_returnToPad"] etherpad_log_level: "INFO" -etherpad_log_appenders: - - type: console -# - -# type: file -# filename: your-log-file-here.log -# maxLogSize: 1024 -# backups: 3 etherpad_abiword_enabled: false etherpad_redis_host: localhost diff --git a/templates/settings.json.j2 b/templates/settings.json.j2 index fd05151..0009193 100644 --- a/templates/settings.json.j2 +++ b/templates/settings.json.j2 @@ -99,7 +99,6 @@ "maxAge": {{ etherpad_max_age }}, "abiword": {{ etherpad_abiword | to_json }}, "soffice": {{ etherpad_soffice }}, - "tidyHtml": {{ etherpad_tidyhtml }}, "allowUnknownFileEnds": {{ etherpad_allow_unknown_file_ends }}, "requireAuthentication": {{ etherpad_require_authentication }}, "requireAuthorization": {{ etherpad_require_authorization }}, @@ -167,14 +166,6 @@ "toolbar": {{ etherpad_toolbar|to_json }}, "exposeVersion": {{ etherpad_expose_version }}, "loglevel": "{{ etherpad_log_level }}", - "logconfig": - { "appenders": [ -{% for appender in etherpad_log_appenders %} - {% if not loop.first %},{% endif %} - {{ appender|to_json }} -{% endfor %} - ] - }, "socketIo": { "maxHttpBufferSize": {{ etherpad_socket_max_http_buffer_size }} },