From 5aeede92e89e2f02fc9d76ba51b4471b214f7d11 Mon Sep 17 00:00:00 2001
From: Arthur BOUDREAULT <arthur@lydra.fr>
Date: Fri, 4 Feb 2022 10:11:14 +0100
Subject: [PATCH] refactor: yunohost tag more consistent
---
roles/ynh_apps/tasks/app.yml | 1 -
roles/ynh_apps/tasks/apps.yml | 3 ---
roles/ynh_apps/tasks/main.yml | 1 -
roles/ynh_config/tasks/autoupdate.yml | 2 ++
roles/ynh_config/tasks/main.yml | 2 ++
roles/ynh_config/tasks/smtp_relay.yml | 2 ++
roles/ynh_setup/tasks/main.yml | 4 ++++
7 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/roles/ynh_apps/tasks/app.yml b/roles/ynh_apps/tasks/app.yml
index f886170..cf7519b 100644
--- a/roles/ynh_apps/tasks/app.yml
+++ b/roles/ynh_apps/tasks/app.yml
@@ -25,7 +25,6 @@
--args "{% for key, value in ynh_app.args.items() %}{{ key }}={{ value }}{% if not loop.last %}&{% endif %}{% endfor %}"
changed_when: False
tags:
- - yunohost
- apps
# Post-installation part
diff --git a/roles/ynh_apps/tasks/apps.yml b/roles/ynh_apps/tasks/apps.yml
index 0bac473..9fb8e0e 100644
--- a/roles/ynh_apps/tasks/apps.yml
+++ b/roles/ynh_apps/tasks/apps.yml
@@ -23,13 +23,11 @@
register: ynh_installed_apps_raw
changed_when: False
tags:
- - yunohost
- apps
- name: Format json of apps
ansible.builtin.set_fact: ynh_installed_apps="{{ ynh_installed_apps_raw.stdout | from_json }}"
tags:
- - yunohost
- apps
- name: Install yunohost apps and perform post-install
@@ -39,5 +37,4 @@
loop_var: ynh_app
when: ynh_app.label not in ynh_installed_apps.values()
tags:
- - yunohost
- apps
diff --git a/roles/ynh_apps/tasks/main.yml b/roles/ynh_apps/tasks/main.yml
index 289486c..e54dd79 100644
--- a/roles/ynh_apps/tasks/main.yml
+++ b/roles/ynh_apps/tasks/main.yml
@@ -22,5 +22,4 @@
ansible.builtin.include_tasks: apps.yml
when: ynh_apps
tags:
- - yunohost
- apps
diff --git a/roles/ynh_config/tasks/autoupdate.yml b/roles/ynh_config/tasks/autoupdate.yml
index e66b57b..d840481 100644
--- a/roles/ynh_config/tasks/autoupdate.yml
+++ b/roles/ynh_config/tasks/autoupdate.yml
@@ -26,6 +26,7 @@
group: root
mode: '0740'
tags:
+ - yunohost
- update
- cron
@@ -38,5 +39,6 @@
job: "{{ ynh_autoupdate.dest_script | default('/usr/local/bin/') }}ynh_autoupdate.sh"
cron_file: ynh_autoupdate_cron
tags:
+ - yunohost
- update
- cron
diff --git a/roles/ynh_config/tasks/main.yml b/roles/ynh_config/tasks/main.yml
index 052e0a2..e9d1561 100644
--- a/roles/ynh_config/tasks/main.yml
+++ b/roles/ynh_config/tasks/main.yml
@@ -23,10 +23,12 @@
loop: "{{ ynh_smtp_relay | dict2items }}"
when: item.value
tags:
+ - yunohost
- smtp
- name: Configures Yunohost autoupdate
ansible.builtin.include_tasks: autoupdate.yml
when: ynh_autoupdate.scheduled
tags:
+ - yunohost
- update
diff --git a/roles/ynh_config/tasks/smtp_relay.yml b/roles/ynh_config/tasks/smtp_relay.yml
index 5f95616..02de043 100644
--- a/roles/ynh_config/tasks/smtp_relay.yml
+++ b/roles/ynh_config/tasks/smtp_relay.yml
@@ -24,6 +24,7 @@
register: _ynh_smtp_current_values
changed_when: False
tags:
+ - yunohost
- smtp
- name: Set new SMTP settings
@@ -31,4 +32,5 @@
"yunohost settings set smtp.relay.{{ item.key }} -v {{ item.value }}"
when: _ynh_smtp_current_values.stdout != item.value
tags:
+ - yunohost
- smtp
diff --git a/roles/ynh_setup/tasks/main.yml b/roles/ynh_setup/tasks/main.yml
index bea97a1..0105337 100644
--- a/roles/ynh_setup/tasks/main.yml
+++ b/roles/ynh_setup/tasks/main.yml
@@ -27,6 +27,7 @@
tags:
- pkg
- linux
+ - yunohost
- name: Create apps and config directories
ansible.builtin.file:
@@ -38,6 +39,7 @@
- "{{ ynh_symlink.conf_dir }}"
tags:
- linux
+ - yunohost
when: ynh_symlink.enabled
- name: Create symbolic link for Yunohost apps data directory
@@ -47,6 +49,7 @@
state: link
tags:
- linux
+ - yunohost
when: ynh_symlink.enabled
- name: Create symbolic link for Yunohost configuration directory
@@ -56,6 +59,7 @@
state: link
tags:
- linux
+ - yunohost
when: ynh_symlink.enabled
- name: Test if Yunohost is already installed
--
GitLab