diff --git a/roles/seafile/tasks/conf.yml b/roles/seafile/tasks/conf.yml index 91fca64..0aad55a 100644 --- a/roles/seafile/tasks/conf.yml +++ b/roles/seafile/tasks/conf.yml @@ -23,7 +23,6 @@ template: src={{ item }}.j2 dest={{ seafile_root_dir }}/conf/{{ item }} group={{ seafile_group }} mode=640 with_items: - seafevents.conf - when: seafile_license is defined notify: - restart seafile - restart seahub diff --git a/roles/seafile/tasks/install.yml b/roles/seafile/tasks/install.yml index 86abb3f..d5685c2 100644 --- a/roles/seafile/tasks/install.yml +++ b/roles/seafile/tasks/install.yml @@ -295,3 +295,11 @@ - clean_db tags: seafile +- name: Fix seafevent start script to work with a venv + replace: + path: /opt/seafile/seafile-server/seafile-monitor.sh + regexp: '/usr/bin/python3' + replace: 'python3' + notify: restart seafile + tags: seafile + diff --git a/roles/seafile/templates/seafevents.conf.j2 b/roles/seafile/templates/seafevents.conf.j2 index f33f891..d139ef2 100644 --- a/roles/seafile/templates/seafevents.conf.j2 +++ b/roles/seafile/templates/seafevents.conf.j2 @@ -9,10 +9,15 @@ name = {{ seafile_db_seahub }} [Syslog] enabled = true -[AUDIT] +[STATISTICS] enabled = true -[STATISTICS] +[SEAHUB EMAIL] +enabled = true +interval = 30m + +{% if seafile_edition == 'pro' %} +[AUDIT] enabled = true [INDEX FILES] @@ -30,10 +35,7 @@ workers = 2 max-pages = 200 max-size = 20 -[SEAHUB EMAIL] -enabled = true -interval = 30m - [AUTO DELETION] enabled = true interval = 86400 +{% endif %} diff --git a/roles/seafile/templates/seafile.conf.j2 b/roles/seafile/templates/seafile.conf.j2 index 915fc37..01e41f2 100644 --- a/roles/seafile/templates/seafile.conf.j2 +++ b/roles/seafile/templates/seafile.conf.j2 @@ -34,6 +34,7 @@ use_go_fileserver = {{ seafile_use_go_fileserver | ternary('true', 'false') }} {% endif %} {% if seafile_license is defined %} use_locked_file_cache = true +fs_cache_limit = 200 [memcached] memcached_options = --SERVER={{ seafile_memcached_server }} --POOL-MIN=10 --POOL-MAX=100 diff --git a/roles/seafile/templates/seahub_settings.py.j2 b/roles/seafile/templates/seahub_settings.py.j2 index 6fc863c..7c0ff9c 100644 --- a/roles/seafile/templates/seahub_settings.py.j2 +++ b/roles/seafile/templates/seahub_settings.py.j2 @@ -105,6 +105,9 @@ REPO_PASSWORD_MIN_LENGTH = 4 ENABLE_REPO_SNAPSHOT_LABEL = True +ENABLE_DELETE_ACCOUNT = False +ENABLE_GET_AUTH_TOKEN_BY_SESSION = True + {% if seafile_oauth2_auth == True %} ENABLE_OAUTH = True OAUTH_ENABLE_INSECURE_TRANSPORT = True