From 9121fd2c37e626668df84512003ad43d9e81d13d Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sat, 23 May 2020 22:40:18 +0200 Subject: [PATCH] server/tt-rss: Moved repo clone method to standardized release tags --- roles/server/tt-rss/defaults/main.yml | 3 +-- roles/server/tt-rss/meta/main.yml | 8 ++++++++ roles/server/tt-rss/tasks/main.yml | 16 ---------------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/roles/server/tt-rss/defaults/main.yml b/roles/server/tt-rss/defaults/main.yml index c34c0f2..42982bb 100644 --- a/roles/server/tt-rss/defaults/main.yml +++ b/roles/server/tt-rss/defaults/main.yml @@ -1,7 +1,6 @@ --- -ttrss_repo: "https://gitlab.com/gothfox/tt-rss.git" -ttrss_version: "master" +repo: "https://git.banananet.work/banananetwork/tt-rss.git" # domain: tt-rss.example service_name: "{{ domain }}.service" diff --git a/roles/server/tt-rss/meta/main.yml b/roles/server/tt-rss/meta/main.yml index 84506e4..e4507cf 100644 --- a/roles/server/tt-rss/meta/main.yml +++ b/roles/server/tt-rss/meta/main.yml @@ -8,6 +8,14 @@ dependencies: # system_user # user_directory user_directory_group: "{{ nginx_system_user }}" + - role: git_auto_update + # repo + repo_name: "{{ domain }}" + dest: "{{ installation_directory }}" + owner: "{{ system_user }}" + group: "{{ nginx_system_user }}" + mode: "u=rwx,g=rx,o=" + reload_command: "true" - role: mysql/database # database_user - role: nginx/php diff --git a/roles/server/tt-rss/tasks/main.yml b/roles/server/tt-rss/tasks/main.yml index 54f89ce..1445b4d 100644 --- a/roles/server/tt-rss/tasks/main.yml +++ b/roles/server/tt-rss/tasks/main.yml @@ -1,21 +1,5 @@ --- -- name: Create installation directory - file: - path: "{{ installation_directory }}" - state: directory - owner: "{{ system_user }}" - group: "{{ nginx_system_user }}" - mode: "u=rwx,g=rx,o=" - -- name: Download Tiny Tiny RSS - become_user: "{{ system_user }}" - git: - repo: "{{ ttrss_repo }}" - version: "{{ ttrss_version }}" - dest: "{{ installation_directory }}" - update: no - - name: Configure Tiny Tiny RSS template: src: config.php