From 710c484056de5a9d9bfff917e6b13ff1f31f2419 Mon Sep 17 00:00:00 2001
From: Arthur BOUDREAULT <boudreaultarthur@ik.me>
Date: Fri, 8 Oct 2021 14:09:23 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor:=20changed=20vars?=
=?UTF-8?q?=20to=20match=20new=20variable=20names?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
tasks/apps.yml | 4 ++--
tasks/domains.yml | 2 +-
tasks/users.yml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tasks/apps.yml b/tasks/apps.yml
index 37776b1..bb73b82 100644
--- a/tasks/apps.yml
+++ b/tasks/apps.yml
@@ -7,7 +7,7 @@
- name: Format json of apps
ansible.builtin.set_fact: yunohost_installed_apps="{{ yunohost_installed_apps_raw.stdout | from_json }}"
-- name: Install apps
+- name: Install yunohost apps
ansible.builtin.shell: yunohost app install {{ item.link }} --label "{{ item.label }}" --args "{% for key, value in item.args.items() %}{{key}}={{value}}{% if not loop.last %}&{% endif %}{% endfor %}"
- with_items: "{{ yunohost.apps }}"
+ with_items: "{{ ynh_apps }}"
when: item.label not in yunohost_installed_apps.values()
diff --git a/tasks/domains.yml b/tasks/domains.yml
index c6c1424..404e8c1 100644
--- a/tasks/domains.yml
+++ b/tasks/domains.yml
@@ -9,5 +9,5 @@
- name: Create domains
ansible.builtin.shell: yunohost domain add {{ item }}
- with_items: "{{ yunohost.extra_domains }}"
+ with_items: "{{ ynh_extra_domains }}"
when: item not in yunohost_installed_domains.domains
diff --git a/tasks/users.yml b/tasks/users.yml
index fac1ed8..00d3a3a 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -7,12 +7,12 @@
- name: Format json of users
ansible.builtin.set_fact: yunohost_registered_users="{{ yunohost_registered_users_raw.stdout | from_json }}"
-- name: Create missing users
+- name: Create missing Yunohost users
ansible.builtin.shell: |
yunohost user create {{ item.name }} \
-f {{ item.firstname }} \
-l {{ item.lastname }} \
-d {{ item.mail_domain }} \
-p {{ item.pass }}
- loop: "{{ yunohost.users }}"
+ loop: "{{ ynh_users }}"
when: item.name not in yunohost_registered_users.users.keys()
--
GitLab