From d85c9e485633c4eff1e41c8ac5a6aa20a71c3fe3 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 5 Jan 2021 21:00:06 +0100
Subject: [PATCH] Update to 2021-01-05 21:00

---
 library/iptables_raw.py                       |  2 +-
 roles/seafile/defaults/main.yml               |  4 ++--
 roles/seafile/tasks/install.yml               | 13 +------------
 roles/seafile/templates/seahub_settings.py.j2 |  2 ++
 roles/seafile/vars/CentOS-7.yml               | 17 +++++++++++++++++
 roles/seafile/vars/CentOS-8.yml               | 17 +++++++++++++++++
 6 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/library/iptables_raw.py b/library/iptables_raw.py
index 090beb2..fd1c863 100644
--- a/library/iptables_raw.py
+++ b/library/iptables_raw.py
@@ -335,7 +335,7 @@ class Iptables:
     # Return a list of active iptables tables
     def _get_list_of_active_tables(self):
         if os.path.isfile(self.iptables_names_file):
-            table_names = "filter\n" + open(self.iptables_names_file, 'r').read()
+            table_names = "filter\nnat\nmangle" + open(self.iptables_names_file, 'r').read()
             list_set = set(table_names.splitlines())
             unique_list = (list(list_set))
             return unique_list
diff --git a/roles/seafile/defaults/main.yml b/roles/seafile/defaults/main.yml
index 9ec278a..79cd218 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('7.1.9','7.1.5') }}"
+seafile_version: "{{ seafile_license is defined | ternary('7.1.9','8.0.2') }}"
 
 # Archive URL and sha1 are only used for the community version
 seafile_archive_url: https://download.seadrive.org/seafile-server_{{ seafile_version }}_x86-64.tar.gz
-seafile_archive_sha1: e4a9abadd04db96965dc4965e824919de02e2143
+seafile_archive_sha1: dcb2fc2adc0e502b64f9ffeee111082c015daebe
 
 seafile_root_dir: /opt/seafile
 seafile_data_dir: "{{ seafile_root_dir }}/data"
diff --git a/roles/seafile/tasks/install.yml b/roles/seafile/tasks/install.yml
index e4309ad..f6dda02 100644
--- a/roles/seafile/tasks/install.yml
+++ b/roles/seafile/tasks/install.yml
@@ -25,18 +25,7 @@
     virtualenv: "{{ seafile_root_dir }}"
     virtualenv_command: /usr/bin/virtualenv-3
     virtualenv_python: /usr/bin/python3
-    name:
-      - Pillow
-      - pylibmc
-      - captcha
-      - jinja2
-      - sqlalchemy
-      - psd-tools
-      - django-pylibmc
-      - django-simple-captcha
-      - python3-ldap
-      - requests_oauthlib
-      #- wsgidav
+    name: "{{ seafile_python_libs }}"
   notify:
     - restart seafile
     - restart seahub
diff --git a/roles/seafile/templates/seahub_settings.py.j2 b/roles/seafile/templates/seahub_settings.py.j2
index eb50d8f..8c8f675 100644
--- a/roles/seafile/templates/seahub_settings.py.j2
+++ b/roles/seafile/templates/seahub_settings.py.j2
@@ -132,6 +132,8 @@ SESSION_COOKIE_AGE = {{ seafile_cookie_age }}
 SITE_NAME = '{{ seafile_site_name }}'
 SITE_TITLE = '{{ seafile_site_title }}'
 
+ENABLE_SYS_ADMIN_VIEW_REPO = True
+
 ENABLE_WIKI = True
 
 {% if seafile_oo_uri is defined %}
diff --git a/roles/seafile/vars/CentOS-7.yml b/roles/seafile/vars/CentOS-7.yml
index 47c9c08..f4e8ab2 100644
--- a/roles/seafile/vars/CentOS-7.yml
+++ b/roles/seafile/vars/CentOS-7.yml
@@ -5,6 +5,9 @@ seafile_packages:
   - python3-setuptools
   - python3-pip
   - python3-virtualenv
+  - python3-devel
+  - gcc
+  - gcc-c++
   - MySQL-python
   - ffmpeg
   - ffmpeg-devel
@@ -20,5 +23,19 @@ seafile_packages:
   - unoconv             # For seafile-pro
   - python-setuptools   # needed for ansible to create the venv
 
+seafile_python_libs:
+  - Pillow
+  - pylibmc
+  - captcha
+  - jinja2
+  - sqlalchemy
+  - psd-tools
+  - django-pylibmc
+  - django-simple-captcha
+  - python3-ldap
+  - requests_oauthlib
+  - future
+  - mysqlclient==2.0.1
+
 seafile_rm_libs:
   - libnssutil3.so
diff --git a/roles/seafile/vars/CentOS-8.yml b/roles/seafile/vars/CentOS-8.yml
index 371b610..bdc260c 100644
--- a/roles/seafile/vars/CentOS-8.yml
+++ b/roles/seafile/vars/CentOS-8.yml
@@ -6,6 +6,9 @@ seafile_packages:
   - python3-pip
   - python3-virtualenv
   - python3-mysql
+  - python3-devel
+  - gcc
+  - gcc-c++
   - ffmpeg
   - ffmpeg-devel
   - libmemcached-devel
@@ -20,6 +23,20 @@ seafile_packages:
   - unoconv              # For seafile-pro
   - python3-setuptools   # needed for ansible to create the venv
 
+seafile_python_libs:
+  - Pillow
+  - pylibmc
+  - captcha
+  - jinja2
+  - sqlalchemy
+  - psd-tools
+  - django-pylibmc
+  - django-simple-captcha
+  - python3-ldap
+  - requests_oauthlib
+  - future
+  - mysqlclient
+
 seafile_rm_libs:
   - liblber-2.4.so.2
   - libldap-2.4.so.2