From a693677b681ba4e1039b3226f9727011c0053ed8 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 10 Aug 2022 10:00:17 +0200 Subject: [PATCH] Update to 2022-08-10 10:00 --- roles/maven/defaults/main.yml | 4 ++-- roles/seafile/defaults/main.yml | 6 +++--- roles/seafile/templates/seahub_settings.py.j2 | 4 ++-- roles/seafile/vars/RedHat-7.yml | 1 + roles/seafile/vars/RedHat-8.yml | 1 + roles/unifi/defaults/main.yml | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/roles/maven/defaults/main.yml b/roles/maven/defaults/main.yml index d569d67..113e84a 100644 --- a/roles/maven/defaults/main.yml +++ b/roles/maven/defaults/main.yml @@ -1,6 +1,6 @@ --- -mvn_version: 3.8.5 +mvn_version: 3.8.6 mvn_archive_url: https://miroir.univ-lorraine.fr/apache/maven/maven-3/{{ mvn_version }}/binaries/apache-maven-{{ mvn_version }}-bin.tar.gz -mvn_archive_sha256: 88e30700f32a3f60e0d28d0f12a3525d29b7c20c72d130153df5b5d6d890c673 +mvn_archive_sha256: c7047a48deb626abf26f71ab3643d296db9b1e67f1faa7d988637deac876b5a9 mvn_root_dir: /opt/maven diff --git a/roles/seafile/defaults/main.yml b/roles/seafile/defaults/main.yml index 819f7c9..412bd68 100644 --- a/roles/seafile/defaults/main.yml +++ b/roles/seafile/defaults/main.yml @@ -11,11 +11,11 @@ # MaxUsers = "9" # Mode = "subscription" # etc... -seafile_version: "{{ seafile_license is defined | ternary('9.0.6','9.0.6') }}" +seafile_version: "{{ seafile_license is defined | ternary('9.0.6','9.0.7') }}" -# Archive URL and sha1 are only used for the community version +# Archive URL and sha256 are only used for the community version seafile_archive_url: https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seafile-server_{{ seafile_version }}_x86-64.tar.gz -seafile_archive_sha256: dc166985197490850e4df3183243c3c286961a34f0ca7670e8172e974f006b11 +seafile_archive_sha256: 78ae9edb07313939e2cb4b57afba5f2c9f8abbd867f39309f32406687f1b53e0 seafile_root_dir: /opt/seafile seafile_data_dir: "{{ seafile_root_dir }}/data" diff --git a/roles/seafile/templates/seahub_settings.py.j2 b/roles/seafile/templates/seahub_settings.py.j2 index 5297b78..f10e9d3 100644 --- a/roles/seafile/templates/seahub_settings.py.j2 +++ b/roles/seafile/templates/seahub_settings.py.j2 @@ -142,8 +142,8 @@ ENABLE_WIKI = True ENABLE_ONLYOFFICE = True 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_FILE_EXTENSION = ('doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx', 'odt', 'fodt', 'odp', 'fodp', 'ods', 'fods', 'oform', 'docxf') +ONLYOFFICE_EDIT_FILE_EXTENSION = ('docx', 'pptx', 'xlsx', 'odt', 'ods', 'odp', 'oform', 'docxf') ONLYOFFICE_FORCE_SAVE = True {% if seafile_oo_secret is defined %} ONLYOFFICE_JWT_SECRET = '{{ seafile_oo_secret }}' diff --git a/roles/seafile/vars/RedHat-7.yml b/roles/seafile/vars/RedHat-7.yml index 305e789..f08756d 100644 --- a/roles/seafile/vars/RedHat-7.yml +++ b/roles/seafile/vars/RedHat-7.yml @@ -37,6 +37,7 @@ seafile_python_libs: - future - mysqlclient==2.0.1 - pycryptodome + - lxml seafile_rm_libs: - libnssutil3.so diff --git a/roles/seafile/vars/RedHat-8.yml b/roles/seafile/vars/RedHat-8.yml index 004cc53..1808d32 100644 --- a/roles/seafile/vars/RedHat-8.yml +++ b/roles/seafile/vars/RedHat-8.yml @@ -37,6 +37,7 @@ seafile_python_libs: - future - mysqlclient - pycryptodome + - lxml seafile_rm_libs: - liblber-2.4.so.2 diff --git a/roles/unifi/defaults/main.yml b/roles/unifi/defaults/main.yml index 0ee99f3..8a7953e 100644 --- a/roles/unifi/defaults/main.yml +++ b/roles/unifi/defaults/main.yml @@ -3,11 +3,11 @@ # Where unifi will be installed unifi_root_dir: /opt/unifi # Version to deploy -unifi_version: 7.1.68 +unifi_version: 7.2.92 # URL to get the installation tarball unifi_archive_url: https://www.ubnt.com/downloads/unifi/{{ unifi_version }}/UniFi.unix.zip # Expected sha256 -unifi_archive_sha256: 3ad474b93203c72b45571dbb0248e700d9231e29c1f8759c729d2d364faa19a9 +unifi_archive_sha256: 59482684ee4a29c4069b6c8f9a756d83a427b7699d958e48ffc5b63465689d58 # Should ansible handle upgrades (if False, only initial install will be done) unifi_manage_upgrade: True # List of ports used by UniFi controler