diff --git a/meta/main.yml b/meta/main.yml index 7080595..dba4f0d 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -4,13 +4,12 @@ galaxy_info: description: Deploy Yunohost with Ansible license: GPL-v3 min_ansible_version: 2.10 - galaxy_tags: [yunohost] platforms: - name: Debian versions: - - jessie - buster - categories: + galaxy_tags: + - yunohost - cloud - web diff --git a/tasks/apps.yml b/tasks/apps.yml index bf55203..6d2fb0c 100644 --- a/tasks/apps.yml +++ b/tasks/apps.yml @@ -10,7 +10,6 @@ - name: Install yunohost apps ansible.builtin.command: yunohost app install {{ item.link }} \ --label "{{ item.label }}" \ - --args "{% for key, value in item.args.items() %}{{ key }}={{ value - }}{% if not loop.last %}&{% endif %}{% endfor %}" + --args "{% for key, value in item.args.items() %}{{ key }}={{ value }}{% if not loop.last %}&{% endif %}{% endfor %}" with_items: "{{ ynh_apps }}" when: item.label not in ynh_installed_apps.values() diff --git a/tasks/main.yml b/tasks/main.yml index 0544997..1719b05 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -15,19 +15,19 @@ url: "{{ ynh_install_script_url }}" dest: /tmp/install_yunohost.sh mode: 700 - when: ynh_file_install.stat.exists == False + when: not ynh_file_install.stat.exists - name: Launch Yunohost install script ansible.builtin.command: /tmp/install_yunohost.sh -a - when: ynh_file_install.stat.exists == False + when: not ynh_file_install.stat.exists - name: Launch Yunohost postinstall ansible.builtin.command: yunohost tools postinstall \ --domain "{{ ynh_main_domain }}" \ --password "{{ ynh_admin_password }}" \ - {% if ynh_ignore_dyndns_server == True %} --ignore-dyndns {% endif %} - when: ynh_file_install.stat.exists == False + {% if ynh_ignore_dyndns_server %} --ignore-dyndns {% endif %} + when: not ynh_file_install.stat.exists - name: Create extra domains ansible.builtin.include_tasks: domains.yml @@ -35,6 +35,7 @@ - name: Run first Yunohost diagnosis ansible.builtin.command: yunohost diagnosis run + when: not ynh_file_install.stat.exists - name: Install domain certificates ansible.builtin.command: yunohost domain cert-install