1
0
Fork 0

Merge branch '12-ansible-test-when-is-smth-rather-than-smth' into 'master'

Resolve "fix: ci lint"

Closes #12

See merge request lydra/yunohost/ansible-yunohost!5
This commit is contained in:
Christophe Chaudier 2021-10-13 16:02:27 +00:00
commit bd22f8c8a1
3 changed files with 8 additions and 9 deletions

View file

@ -4,13 +4,12 @@ galaxy_info:
description: Deploy Yunohost with Ansible description: Deploy Yunohost with Ansible
license: GPL-v3 license: GPL-v3
min_ansible_version: 2.10 min_ansible_version: 2.10
galaxy_tags: [yunohost]
platforms: platforms:
- name: Debian - name: Debian
versions: versions:
- jessie
- buster - buster
categories: galaxy_tags:
- yunohost
- cloud - cloud
- web - web

View file

@ -10,7 +10,6 @@
- name: Install yunohost apps - name: Install yunohost apps
ansible.builtin.command: yunohost app install {{ item.link }} \ ansible.builtin.command: yunohost app install {{ item.link }} \
--label "{{ item.label }}" \ --label "{{ item.label }}" \
--args "{% for key, value in item.args.items() %}{{ key }}={{ value --args "{% for key, value in item.args.items() %}{{ key }}={{ value }}{% if not loop.last %}&{% endif %}{% endfor %}"
}}{% if not loop.last %}&{% endif %}{% endfor %}"
with_items: "{{ ynh_apps }}" with_items: "{{ ynh_apps }}"
when: item.label not in ynh_installed_apps.values() when: item.label not in ynh_installed_apps.values()

View file

@ -15,19 +15,19 @@
url: "{{ ynh_install_script_url }}" url: "{{ ynh_install_script_url }}"
dest: /tmp/install_yunohost.sh dest: /tmp/install_yunohost.sh
mode: 700 mode: 700
when: ynh_file_install.stat.exists == False when: not ynh_file_install.stat.exists
- name: Launch Yunohost install script - name: Launch Yunohost install script
ansible.builtin.command: /tmp/install_yunohost.sh -a 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 - name: Launch Yunohost postinstall
ansible.builtin.command: ansible.builtin.command:
yunohost tools postinstall \ yunohost tools postinstall \
--domain "{{ ynh_main_domain }}" \ --domain "{{ ynh_main_domain }}" \
--password "{{ ynh_admin_password }}" \ --password "{{ ynh_admin_password }}" \
{% if ynh_ignore_dyndns_server == True %} --ignore-dyndns {% endif %} {% if ynh_ignore_dyndns_server %} --ignore-dyndns {% endif %}
when: ynh_file_install.stat.exists == False when: not ynh_file_install.stat.exists
- name: Create extra domains - name: Create extra domains
ansible.builtin.include_tasks: domains.yml ansible.builtin.include_tasks: domains.yml
@ -35,6 +35,7 @@
- name: Run first Yunohost diagnosis - name: Run first Yunohost diagnosis
ansible.builtin.command: yunohost diagnosis run ansible.builtin.command: yunohost diagnosis run
when: not ynh_file_install.stat.exists
- name: Install domain certificates - name: Install domain certificates
ansible.builtin.command: yunohost domain cert-install ansible.builtin.command: yunohost domain cert-install