From 11271c8d3a910a2929d074a98704ba5ef5e329d8 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 25 Jun 2024 15:00:46 +0200 Subject: [PATCH] Update to 2024-06-25 15:00 --- roles/seafile/defaults/main.yml | 2 +- ...le-pro-server_10.0.16_x86-64_CentOS.tar.gz | 3 ++ ...ile-pro-server_10.0.9_x86-64_CentOS.tar.gz | 3 -- roles/seafile/tasks/install.yml | 10 +++- roles/seafile/vars/RedHat-8.yml | 47 ++++++++++--------- roles/seafile/vars/RedHat-9.yml | 47 ++++++++++--------- 6 files changed, 65 insertions(+), 47 deletions(-) create mode 100644 roles/seafile/files/seafile-pro-server_10.0.16_x86-64_CentOS.tar.gz delete mode 100644 roles/seafile/files/seafile-pro-server_10.0.9_x86-64_CentOS.tar.gz diff --git a/roles/seafile/defaults/main.yml b/roles/seafile/defaults/main.yml index bb94fd5..d83c9e1 100644 --- a/roles/seafile/defaults/main.yml +++ b/roles/seafile/defaults/main.yml @@ -11,7 +11,7 @@ # MaxUsers = "9" # Mode = "subscription" # etc... -seafile_version: "{{ seafile_license is defined | ternary('10.0.9','11.0.9') }}" +seafile_version: "{{ seafile_license is defined | ternary('10.0.16','11.0.9') }}" # 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 diff --git a/roles/seafile/files/seafile-pro-server_10.0.16_x86-64_CentOS.tar.gz b/roles/seafile/files/seafile-pro-server_10.0.16_x86-64_CentOS.tar.gz new file mode 100644 index 0000000..9998db9 --- /dev/null +++ b/roles/seafile/files/seafile-pro-server_10.0.16_x86-64_CentOS.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:677344c9ec85a95d80f6b4f31d596af0f662b166bfb6beea9f374a6af773c6ce +size 205621872 diff --git a/roles/seafile/files/seafile-pro-server_10.0.9_x86-64_CentOS.tar.gz b/roles/seafile/files/seafile-pro-server_10.0.9_x86-64_CentOS.tar.gz deleted file mode 100644 index e8be6d6..0000000 --- a/roles/seafile/files/seafile-pro-server_10.0.9_x86-64_CentOS.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1342b561365a330939e0832f26deefdd4dca12806cb5f87daa083e18e46398f8 -size 205519649 diff --git a/roles/seafile/tasks/install.yml b/roles/seafile/tasks/install.yml index cbb01ba..12c0128 100644 --- a/roles/seafile/tasks/install.yml +++ b/roles/seafile/tasks/install.yml @@ -162,7 +162,15 @@ # Needed since CentOS 7.5 so ldaps can be used - name: Remove bundled libs file: path={{ seafile_root_dir }}/seafile-server/seafile/lib/{{ item }} state=absent - loop: "{{ seafile_rm_libs[seafile_edition] }}" + loop: "{{ seafile_rm_libs.community }}" + when: seafile_license is not defined + notify: restart seafile + tags: seafile + +- name: Remove bundled libs + file: path={{ seafile_root_dir }}/seafile-server/seafile/lib/{{ item }} state=absent + loop: "{{ seafile_rm_libs.pro }}" + when: seafile_license is defined notify: restart seafile tags: seafile diff --git a/roles/seafile/vars/RedHat-8.yml b/roles/seafile/vars/RedHat-8.yml index 43d96f5..1cdb6ee 100644 --- a/roles/seafile/vars/RedHat-8.yml +++ b/roles/seafile/vars/RedHat-8.yml @@ -25,42 +25,47 @@ seafile_packages: seafile_python_libs: community: - - pillow==10.0.* + - django==4.2.* + - future==0.18.* + - mysqlclient==2.1.* + - pymysql + - pillow==10.2.* - pylibmc - - captcha==0.4 + - captcha==0.5.* + - markupsafe==2.0.1 - jinja2 - - SQLAlchemy==2.0.18 + - sqlalchemy==2.0.18 - psd-tools - django-pylibmc - - django_simple_captcha==0.5.* + - django_simple_captcha==0.6.* - djangosaml2==1.5.* - pysaml2==7.2.* + - pycryptodome==3.16.* + - cffi==1.15.1 + - lxml - python-ldap==3.4.3 - requests_oauthlib - - future==0.18.* - - mysqlclient==2.1.* - - pycryptodome==3.16.* - - cffi==1.15.1 - - lxml - chardet pro: - - pillow==9.3.* - - pylibmc - - captcha==0.4 - - jinja2 - - SQLAlchemy==1.4.3 - - psd-tools - - django-pylibmc - - django_simple_captcha==0.5.* - - djangosaml2==1.5.* - - pysaml2==7.2.* - - python-ldap - - requests_oauthlib + - django==3.2.* - future==0.18.* - mysqlclient==2.1.* + - pymysql + - pillow==10.2.* + - pylibmc + - captcha==0.5.* + - markupsafe==2.0.1 + - jinja2 + - sqlalchemy==1.4.3 + - psd-tools + - django-pylibmc + - django_simple_captcha==0.5.20 + - djangosaml2==1.5.* + - pysaml2==7.2.* - pycryptodome==3.16.* - cffi==1.15.1 - lxml + - requests_oauthlib - chardet seafile_rm_libs: diff --git a/roles/seafile/vars/RedHat-9.yml b/roles/seafile/vars/RedHat-9.yml index 43d96f5..1cdb6ee 100644 --- a/roles/seafile/vars/RedHat-9.yml +++ b/roles/seafile/vars/RedHat-9.yml @@ -25,42 +25,47 @@ seafile_packages: seafile_python_libs: community: - - pillow==10.0.* + - django==4.2.* + - future==0.18.* + - mysqlclient==2.1.* + - pymysql + - pillow==10.2.* - pylibmc - - captcha==0.4 + - captcha==0.5.* + - markupsafe==2.0.1 - jinja2 - - SQLAlchemy==2.0.18 + - sqlalchemy==2.0.18 - psd-tools - django-pylibmc - - django_simple_captcha==0.5.* + - django_simple_captcha==0.6.* - djangosaml2==1.5.* - pysaml2==7.2.* + - pycryptodome==3.16.* + - cffi==1.15.1 + - lxml - python-ldap==3.4.3 - requests_oauthlib - - future==0.18.* - - mysqlclient==2.1.* - - pycryptodome==3.16.* - - cffi==1.15.1 - - lxml - chardet pro: - - pillow==9.3.* - - pylibmc - - captcha==0.4 - - jinja2 - - SQLAlchemy==1.4.3 - - psd-tools - - django-pylibmc - - django_simple_captcha==0.5.* - - djangosaml2==1.5.* - - pysaml2==7.2.* - - python-ldap - - requests_oauthlib + - django==3.2.* - future==0.18.* - mysqlclient==2.1.* + - pymysql + - pillow==10.2.* + - pylibmc + - captcha==0.5.* + - markupsafe==2.0.1 + - jinja2 + - sqlalchemy==1.4.3 + - psd-tools + - django-pylibmc + - django_simple_captcha==0.5.20 + - djangosaml2==1.5.* + - pysaml2==7.2.* - pycryptodome==3.16.* - cffi==1.15.1 - lxml + - requests_oauthlib - chardet seafile_rm_libs: