From 647bbdc06c486bccbb443d1be64b1c3b0faa9e40 Mon Sep 17 00:00:00 2001 From: Max Mehl Date: Fri, 22 Sep 2023 10:34:08 +0200 Subject: [PATCH] turn into installing seafile-mirror via pip(x) --- .gitmodules | 3 --- files/seafile-mirror | 1 - tasks/main.yml | 27 +++++++++++---------------- 3 files changed, 11 insertions(+), 20 deletions(-) delete mode 160000 files/seafile-mirror diff --git a/.gitmodules b/.gitmodules index dc6ced1..d98cbd6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,3 @@ # # SPDX-License-Identifier: Apache-2.0 -[submodule "files/seafile-mirror"] - path = files/seafile-mirror - url = https://src.mehl.mx/mxmehl/seafile-mirror.git diff --git a/files/seafile-mirror b/files/seafile-mirror deleted file mode 160000 index 8c54fd3..0000000 --- a/files/seafile-mirror +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8c54fd318a95edb6f5ec85d7651f3891d2286f6c diff --git a/tasks/main.yml b/tasks/main.yml index e44d0ae..9a1c152 100755 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -16,11 +16,19 @@ apt: name: - moreutils # chronic - - python3-yaml + - pipx - systemd-container # necessary to use machinectl become_method - seafile-cli become: false # need to do this as root +- name: Install seafile-mirror with pipx + command: pipx install seafile-mirror + changed_when: false + +- name: Upgrade seafile-mirror with pipx + command: pipx upgrade seafile-mirror + changed_when: false + - name: Register user info of {{ seafile_local_user.user }} user: name: "{{ seafile_local_user.user }}" @@ -33,24 +41,11 @@ - name: Ensure directory for Seafile mirror service exists file: - path: "{{ seafile_mirror_dir }}/functions" + path: "{{ seafile_mirror_dir }}" state: directory mode: 0755 recurse: true -- name: Ensure Seafile mirror script and its functions exists - copy: - src: "seafile-mirror/{{ item.src }}" - dest: "{{ item.dest }}" - mode: 0755 - loop: - - {src: "seafile_mirror.py", dest: "{{ seafile_mirror_dir }}/"} - - {src: "functions/__init__.py", dest: '{{ seafile_mirror_dir }}/functions/'} - - {src: "functions/cachedb.py", dest: '{{ seafile_mirror_dir }}/functions/'} - - {src: "functions/helpers.py", dest: '{{ seafile_mirror_dir }}/functions/'} - - {src: "functions/seafile.py", dest: '{{ seafile_mirror_dir }}/functions/'} - - - name: Ensure Seafile mirror configuration exists template: src: seafile_mirror.conf.yaml.j2 @@ -60,7 +55,7 @@ - name: Ensure cron entry for Seafile mirror service cron: name: Seafile Mirror Service - job: "chronic python3 {{ seafile_mirror_dir }}/seafile_mirror.py -c {{ seafile_mirror_dir }} -v" + job: "chronic pipx run seafile-mirror -c {{ seafile_mirror_dir }} -v" hour: "23" minute: "20"