Update to 2020-12-21 15:00

master
Daniel Berteaud 4 years ago
parent df24dbb071
commit 155df8e0e6
  1. 5
      roles/common/tasks/facts.yml
  2. 1
      roles/common/tasks/main.yml
  3. 1
      roles/common/tasks/system.yml
  4. 3
      roles/common/templates/bash_aliases.sh.j2
  5. BIN
      roles/lemonldap_ng/files/logos/itop.png
  6. 1
      roles/nginx/defaults/main.yml
  7. 4
      roles/onlyoffice_document_server/defaults/main.yml
  8. 2
      roles/onlyoffice_document_server/templates/oods.json.j2
  9. 1
      roles/seafile/templates/seahub_settings.py.j2
  10. 3
      roles/squid/files/acl/software_various.domains

@ -0,0 +1,5 @@
---
- name: Check if tailf command exists
stat: path=/bin/tailf
register: system_tailf

@ -6,6 +6,7 @@
- vars/{{ ansible_distribution }}.yml - vars/{{ ansible_distribution }}.yml
- vars/{{ ansible_os_family }}.yml - vars/{{ ansible_os_family }}.yml
- include: facts.yml
- include_tasks: utils.yml - include_tasks: utils.yml
- include_tasks: hostname.yml - include_tasks: hostname.yml
- include_tasks: tz.yml - include_tasks: tz.yml

@ -166,4 +166,5 @@
- name: Enable rc-local-shutdown service - name: Enable rc-local-shutdown service
service: name=rc-local-shutdown enabled=True service: name=rc-local-shutdown enabled=True
... ...

@ -8,3 +8,6 @@ eval "`dircolors`"
{% for alias in system_bash_aliases.keys() | list %} {% for alias in system_bash_aliases.keys() | list %}
alias {{ alias }}='{{ system_bash_aliases[alias] }}' alias {{ alias }}='{{ system_bash_aliases[alias] }}'
{% endfor %} {% endfor %}
{% if not system_tailf.stat.exists %}
alias tailf='tail -f'
{% endif %}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

@ -60,6 +60,7 @@ nginx_default_vhost_base:
X-Real-IP: '$remote_addr' X-Real-IP: '$remote_addr'
X-Forwarded-Proto: '$scheme' X-Forwarded-Proto: '$scheme'
X-Forwarded-Host: '$host' X-Forwarded-Host: '$host'
X-Forwarded-Port: '$server_port'
Host: '$host' Host: '$host'
allowed_methods: allowed_methods:
- GET - GET

@ -15,3 +15,7 @@ oo_redis_port: 6379
# oo_secret: XXXX # oo_secret: XXXX
oo_ds_vhost: onlyoffice-ds.{{ ansible_domain }} 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

@ -37,10 +37,12 @@
"dbPass": "{{ oo_db_pass }}", "dbPass": "{{ oo_db_pass }}",
"charset": "utf8" "charset": "utf8"
}, },
{% if oo_auto_save %}
"autoAssembly": { "autoAssembly": {
"enable": true, "enable": true,
"interval": "5m" "interval": "5m"
}, },
{% endif %}
"server": { "server": {
"static_content": { "static_content": {
"/fonts": { "/fonts": {

@ -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_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_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_EDIT_FILE_EXTENSION = ('docx', 'pptx', 'xlsx', 'odt', 'ods', 'odp')
ONLYOFFICE_FORCE_SAVE = True
{% if seafile_oo_secret is defined %} {% if seafile_oo_secret is defined %}
ONLYOFFICE_JWT_SECRET = '{{ seafile_oo_secret }}' ONLYOFFICE_JWT_SECRET = '{{ seafile_oo_secret }}'
{% endif %} {% endif %}

@ -331,3 +331,6 @@ getcomposer.org
# Sentry # Sentry
downloads.sentry-cdn.com downloads.sentry-cdn.com
# iTop cmd extension store
store.itophub.io

Loading…
Cancel
Save