diff --git a/roles/common/tasks/facts.yml b/roles/common/tasks/facts.yml new file mode 100644 index 0000000..6ab12be --- /dev/null +++ b/roles/common/tasks/facts.yml @@ -0,0 +1,5 @@ +--- + +- name: Check if tailf command exists + stat: path=/bin/tailf + register: system_tailf diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 62739c8..299ee26 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -6,6 +6,7 @@ - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml +- include: facts.yml - include_tasks: utils.yml - include_tasks: hostname.yml - include_tasks: tz.yml diff --git a/roles/common/tasks/system.yml b/roles/common/tasks/system.yml index 7ebec00..21aa3df 100644 --- a/roles/common/tasks/system.yml +++ b/roles/common/tasks/system.yml @@ -166,4 +166,5 @@ - name: Enable rc-local-shutdown service service: name=rc-local-shutdown enabled=True + ... diff --git a/roles/common/templates/bash_aliases.sh.j2 b/roles/common/templates/bash_aliases.sh.j2 index ede3b11..9a7a9b6 100644 --- a/roles/common/templates/bash_aliases.sh.j2 +++ b/roles/common/templates/bash_aliases.sh.j2 @@ -8,3 +8,6 @@ eval "`dircolors`" {% for alias in system_bash_aliases.keys() | list %} alias {{ alias }}='{{ system_bash_aliases[alias] }}' {% endfor %} +{% if not system_tailf.stat.exists %} +alias tailf='tail -f' +{% endif %} diff --git a/roles/lemonldap_ng/files/logos/itop.png b/roles/lemonldap_ng/files/logos/itop.png index 6ba77e9..daab8b0 100644 Binary files a/roles/lemonldap_ng/files/logos/itop.png and b/roles/lemonldap_ng/files/logos/itop.png differ diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index 813380c..78a680b 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -60,6 +60,7 @@ nginx_default_vhost_base: X-Real-IP: '$remote_addr' X-Forwarded-Proto: '$scheme' X-Forwarded-Host: '$host' + X-Forwarded-Port: '$server_port' Host: '$host' allowed_methods: - GET diff --git a/roles/onlyoffice_document_server/defaults/main.yml b/roles/onlyoffice_document_server/defaults/main.yml index 4587ac6..5f1ad22 100644 --- a/roles/onlyoffice_document_server/defaults/main.yml +++ b/roles/onlyoffice_document_server/defaults/main.yml @@ -15,3 +15,7 @@ oo_redis_port: 6379 # oo_secret: XXXX oo_ds_vhost: onlyoffice-ds.{{ ansible_domain }} + +# Is auto-saving of file enabled +# If true, files will be saved every 5 minutes +oo_auto_save: True diff --git a/roles/onlyoffice_document_server/templates/oods.json.j2 b/roles/onlyoffice_document_server/templates/oods.json.j2 index ec7cad0..ecb5b71 100644 --- a/roles/onlyoffice_document_server/templates/oods.json.j2 +++ b/roles/onlyoffice_document_server/templates/oods.json.j2 @@ -37,10 +37,12 @@ "dbPass": "{{ oo_db_pass }}", "charset": "utf8" }, +{% if oo_auto_save %} "autoAssembly": { "enable": true, "interval": "5m" }, +{% endif %} "server": { "static_content": { "/fonts": { diff --git a/roles/seafile/templates/seahub_settings.py.j2 b/roles/seafile/templates/seahub_settings.py.j2 index f305966..eb50d8f 100644 --- a/roles/seafile/templates/seahub_settings.py.j2 +++ b/roles/seafile/templates/seahub_settings.py.j2 @@ -140,6 +140,7 @@ VERIFY_ONLYOFFICE_CERTIFICATE = True ONLYOFFICE_APIJS_URL = "{{ (seafile_oo_uri is search('api\.js$')) | ternary(seafile_oo_uri,seafile_oo_uri | regex_replace('/$','') + '/web-apps/apps/api/documents/api.js') }}" ONLYOFFICE_FILE_EXTENSION = ('doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx', 'odt', 'fodt', 'odp', 'fodp', 'ods', 'fods') ONLYOFFICE_EDIT_FILE_EXTENSION = ('docx', 'pptx', 'xlsx', 'odt', 'ods', 'odp') +ONLYOFFICE_FORCE_SAVE = True {% if seafile_oo_secret is defined %} ONLYOFFICE_JWT_SECRET = '{{ seafile_oo_secret }}' {% endif %} diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains index fb319da..3f77d92 100644 --- a/roles/squid/files/acl/software_various.domains +++ b/roles/squid/files/acl/software_various.domains @@ -331,3 +331,6 @@ getcomposer.org # Sentry downloads.sentry-cdn.com + +# iTop cmd extension store +store.itophub.io