diff --git a/plugins/README.md b/plugins/README.md deleted file mode 100644 index 448a4ba607a4631f8acf9b9228f701f02a9d59c8..0000000000000000000000000000000000000000 --- a/plugins/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# Collections Plugins Directory - -This directory can be used to ship various plugins inside an Ansible collection. Each plugin is placed in a folder that -is named after the type of plugin it is in. It can also include the `module_utils` and `modules` directory that -would contain module utils and modules respectively. - -Here is an example directory of the majority of plugins currently supported by Ansible: - -``` -└── plugins - ├── action - ├── become - ├── cache - ├── callback - ├── cliconf - ├── connection - ├── filter - ├── httpapi - ├── inventory - ├── lookup - ├── module_utils - ├── modules - ├── netconf - ├── shell - ├── strategy - ├── terminal - ├── test - └── vars -``` - -A full list of plugin types can be found at [Working With Plugins](https://docs.ansible.com/ansible/2.10/plugins/plugins.html). diff --git a/roles/ynh_backup/README.md b/roles/ynh_backup/README.md index 83824154d9c17f3ad26e107d7ba13c03c56585c4..4d830cad241a3a67b9050b4ce56cddb116061a8f 100644 --- a/roles/ynh_backup/README.md +++ b/roles/ynh_backup/README.md @@ -56,17 +56,11 @@ None. ```yml --- -- name: Install Yunohost on Debian Server +- name: Configure Yunohost backups hosts: all become: True collections: - lydra.yunohost - pre_tasks: - - name: Update all packages and index - ansible.builtin.apt: - upgrade: dist - update_cache: yes - roles: - ynh_backup ``` diff --git a/roles/ynh_backup/tasks/backup.yml b/roles/ynh_backup/tasks/backup.yml index b6f4926e4507d95822d16ec86e7dc88f6a02d6e8..f2d83ff2b2293721e22c16983b560c5a9c031607 100644 --- a/roles/ynh_backup/tasks/backup.yml +++ b/roles/ynh_backup/tasks/backup.yml @@ -23,7 +23,7 @@ path: "{{ ynh_backup.directory | default('/home/yunohost.backup/archives') }}" state: directory mode: '0750' - tags: + tags: - "backup" - name: Create backup script @@ -33,7 +33,7 @@ owner: root group: root mode: '0740' - tags: + tags: - "backup" - "cron" @@ -47,6 +47,6 @@ user: root job: "{{ ynh_backup.dest_script | default('/usr/local/bin/') }}ynh_backup.sh" cron_file: ynh_backup_cron - tags: + tags: - "backup" - "cron" diff --git a/roles/ynh_backup/tasks/main.yml b/roles/ynh_backup/tasks/main.yml index 73baaf392f2d053efaeed7861f5df51b51ade448..328ff061d1ecd5849e3a4b976f79ace7682579b7 100644 --- a/roles/ynh_backup/tasks/main.yml +++ b/roles/ynh_backup/tasks/main.yml @@ -21,5 +21,5 @@ - name: Enable Yunohost apps backup ansible.builtin.include_tasks: backup.yml when: ynh_backup.scheduled - tags: + tags: - "backup" diff --git a/roles/ynh_config/README-FR.md b/roles/ynh_config/README-FR.md index 882a71a8c8b212ce6c7e29180e0969aa61ee28d6..ffc3fd4d0f176034765d54a6daf9bd2c29afb34d 100644 --- a/roles/ynh_config/README-FR.md +++ b/roles/ynh_config/README-FR.md @@ -68,17 +68,11 @@ Aucune. ```yml --- -- name: Install Yunohost on Debian Server +- name: Configure Yunohost on Debian Server hosts: all become: True collections: - lydra.yunohost - pre_tasks: - - name: Update all packages and index - ansible.builtin.apt: - upgrade: dist - update_cache: yes - roles: - ynh_config ``` diff --git a/roles/ynh_config/README.md b/roles/ynh_config/README.md index b704c6e0760d2c4ced189fc4124d55a2c02e091b..d930149bbbf680bcf4c2519aabdded15ff8b71d1 100644 --- a/roles/ynh_config/README.md +++ b/roles/ynh_config/README.md @@ -56,7 +56,7 @@ A cron job can been set up to automate the check for system and application upda - `ynh_autoupdate.system`: is mandatory. Enables automatic updating of the Yunohost system by setting the value to `True`. - `ynh_autoupdate.dest_script`: it is the path to the directory where the update script will be installed on the server. The default value is `/usr/local/bin`. The script is named `ynh_autoupdate.sh`. -If available, updates are done automatically. In case of problems following an application update, you can read logs located in `/var/log/yunohost/categories/operation` . You also have the possibility to rollback to the previous version since Yunohost always makes an automatic backup of an application when it is updated. +If available, updates are done automatically. In case of problems following an application update, you can read logs located in `/var/log/yunohost/categories/operation` . You also have the possibility to rollback to the previous version since Yunohost always makes an automatic backup of an application when it is updated. To learn more about how updates work in Yunohost you can go [here](https://yunohost.org/fr/update). The changelog of Yunohost versions is also available [here](https://forum.yunohost.org/tag/ynh_release). @@ -68,17 +68,11 @@ None. ```yml --- -- name: Install Yunohost on Debian Server +- name: Configure Yunohost on Debian Server hosts: all become: True collections: - lydra.yunohost - pre_tasks: - - name: Update all packages and index - ansible.builtin.apt: - upgrade: dist - update_cache: yes - roles: - ynh_config ``` diff --git a/roles/ynh_config/tasks/autoupdate.yml b/roles/ynh_config/tasks/autoupdate.yml index 8678d9e3f1e74c4ab3a3b47d02c0134c3188a748..a4d4ab1ea3f1a1a338049e54dd350b9e49d77407 100644 --- a/roles/ynh_config/tasks/autoupdate.yml +++ b/roles/ynh_config/tasks/autoupdate.yml @@ -25,7 +25,7 @@ owner: root group: root mode: '0740' - tags: + tags: - "update" - "cron" @@ -37,6 +37,6 @@ user: root job: "{{ ynh_autoupdate.dest_script | default('/usr/local/bin/') }}ynh_autoupdate.sh" cron_file: ynh_autoupdate_cron - tags: + tags: - "update" - "cron" diff --git a/roles/ynh_config/tasks/main.yml b/roles/ynh_config/tasks/main.yml index fbcd358ad18c2a4142286861e904cb3125dfee23..9acd0f0b6d636195ebff9586e9c7da2784ed439a 100644 --- a/roles/ynh_config/tasks/main.yml +++ b/roles/ynh_config/tasks/main.yml @@ -28,5 +28,5 @@ - name: Configures Yunohost autoupdate ansible.builtin.include_tasks: autoupdate.yml when: ynh_autoupdate.scheduled - tags: + tags: - "update" diff --git a/roles/ynh_setup/tasks/app.yml b/roles/ynh_setup/tasks/app.yml index d0395996930921de3476ace9896734ea3803c595..f7c824c4302010962a2c15da3b7582bfb101ee82 100644 --- a/roles/ynh_setup/tasks/app.yml +++ b/roles/ynh_setup/tasks/app.yml @@ -24,7 +24,7 @@ --label "{{ ynh_app.label }}" \ --args "{% for key, value in ynh_app.args.items() %}{{ key }}={{ value }}{% if not loop.last %}&{% endif %}{% endfor %}" changed_when: False - tags: + tags: - "yunohost" - "apps" @@ -38,7 +38,7 @@ mode: "{{ (item.type == 'script') | ternary('740', '660') }}" loop: "{{ ynh_app.post_install|default([]) }}" when: ynh_app.post_install - tags: + tags: - "apps" - name: Launch post-install script @@ -49,7 +49,7 @@ loop_control: loop_var: ynh_app_post_install when: ynh_app_post_install.type == "script" - tags: + tags: - "apps" - name: Remove script after execution @@ -60,5 +60,5 @@ loop_control: loop_var: ynh_app_post_install when: ynh_app_post_install.type == "script" - tags: + tags: - "apps" diff --git a/roles/ynh_setup/tasks/apps.yml b/roles/ynh_setup/tasks/apps.yml index 9289ddd46860e4350532f48cd82522eb0583169c..ebc3a841007eb86274e69017c048d5709e273374 100644 --- a/roles/ynh_setup/tasks/apps.yml +++ b/roles/ynh_setup/tasks/apps.yml @@ -22,13 +22,13 @@ ansible.builtin.command: yunohost app map --output-as json register: ynh_installed_apps_raw changed_when: False - tags: + tags: - "yunohost" - "apps" - name: Format json of apps ansible.builtin.set_fact: ynh_installed_apps="{{ ynh_installed_apps_raw.stdout | from_json }}" - tags: + tags: - "yunohost" - "apps" @@ -38,7 +38,7 @@ loop_control: loop_var: ynh_app when: ynh_app.label not in ynh_installed_apps.values() - tags: + tags: - "yunohost" - "apps" diff --git a/roles/ynh_setup/tasks/domains.yml b/roles/ynh_setup/tasks/domains.yml index baa41afb2e9ede6b37bd71de4a9941964e0394bc..d018858a85d891204154111824b46cdd30d7dee0 100644 --- a/roles/ynh_setup/tasks/domains.yml +++ b/roles/ynh_setup/tasks/domains.yml @@ -22,13 +22,13 @@ ansible.builtin.command: yunohost domain list --output-as json register: ynh_installed_domains_raw changed_when: False - tags: + tags: - "yunohost" - "domains" - name: Format json of domains ansible.builtin.set_fact: ynh_installed_domains="{{ ynh_installed_domains_raw.stdout | from_json }}" - tags: + tags: - "yunohost" - "domains" @@ -36,6 +36,6 @@ ansible.builtin.command: yunohost domain add {{ item }} with_items: "{{ ynh_extra_domains }}" when: item not in ynh_installed_domains.domains - tags: + tags: - "yunohost" - "domains" diff --git a/roles/ynh_setup/tasks/main.yml b/roles/ynh_setup/tasks/main.yml index 2736af9005c5e87e391c69cee32a0dde21a4a74a..3041ee7525495ea75c8dc78d4d2595c854b9de2d 100644 --- a/roles/ynh_setup/tasks/main.yml +++ b/roles/ynh_setup/tasks/main.yml @@ -24,13 +24,13 @@ - git - dialog state: present - tags: + tags: - "pkg" - name: Test if Yunohost is already installed ansible.builtin.stat: path=/etc/yunohost/installed register: ynh_file_install - tags: + tags: - "yunohost" - name: Download Yunohost install script @@ -39,13 +39,13 @@ dest: /tmp/install_yunohost.sh mode: 700 when: not ynh_file_install.stat.exists - tags: + tags: - "yunohost" - name: Launch Yunohost install script ansible.builtin.command: /tmp/install_yunohost.sh -a when: not ynh_file_install.stat.exists - tags: + tags: - "yunohost" - name: Launch Yunohost postinstall @@ -55,39 +55,39 @@ --password "{{ ynh_admin_password }}" \ {% if ynh_ignore_dyndns_server %} --ignore-dyndns {% endif %} when: not ynh_file_install.stat.exists - tags: + tags: - "yunohost" - "domains" - name: Create extra domains ansible.builtin.include_tasks: domains.yml when: ynh_extra_domains - tags: + tags: - "yunohost" - "domains" - name: Run first Yunohost diagnosis ansible.builtin.command: yunohost diagnosis run when: not ynh_file_install.stat.exists - tags: + tags: - "yunohost" - name: Install domain certificates ansible.builtin.command: yunohost domain cert-install changed_when: False - tags: + tags: - "yunohost" - name: Add Yunohost users ansible.builtin.include_tasks: users.yml when: ynh_users - tags: + tags: - "yunohost" - "users" - name: Install Yunohost apps ansible.builtin.include_tasks: apps.yml when: ynh_apps - tags: + tags: - "yunohost" - "apps" diff --git a/roles/ynh_setup/tasks/users.yml b/roles/ynh_setup/tasks/users.yml index d4ad86af16009e7f6d5f02024442688685c141d6..5a93dc248dace78939a775f23e7e088c11070fe7 100644 --- a/roles/ynh_setup/tasks/users.yml +++ b/roles/ynh_setup/tasks/users.yml @@ -22,13 +22,13 @@ ansible.builtin.command: yunohost user list --output-as json register: ynh_registered_users_raw changed_when: False - tags: + tags: - "yunohost" - "users" - name: Format json of users ansible.builtin.set_fact: ynh_registered_users="{{ ynh_registered_users_raw.stdout | from_json }}" - tags: + tags: - "yunohost" - "users" @@ -41,6 +41,6 @@ -p "{{ item.pass }}" loop: "{{ ynh_users }}" when: item.name not in ynh_registered_users.users.keys() - tags: + tags: - "yunohost" - "users"