README-FR.md

 [![](https://img.shields.io/liberapay/receives/cchaudier.svg?logo=liberapay)](https://liberapay.com/cchaudier/donate)
 [![](https://lab.frogg.it/lydra/yunohost/ansible-yunohost/badges/main/pipeline.svg)](https://lab.frogg.it/lydra/yunohost/ansible-yunohost/-/pipelines)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0)
-[![Ansible Role](https://img.shields.io/ansible/role/56544)](https://galaxy.ansible.com/lydra/yunohost)
-[![Ansible Quality Score](https://img.shields.io/ansible/quality/56544)](https://galaxy.ansible.com/lydra/yunohost)
-[![Ansible Role](https://img.shields.io/ansible/role/d/56544)](https://galaxy.ansible.com/lydra/yunohost)
+[![Ansible Collection](https://img.shields.io/ansible/collection/1838)](https://galaxy.ansible.com/lydra/yunohost)
 [![GitHub last commit](https://img.shields.io/github/last-commit/LydraFr/ansible-yunohost)](https://github.com/LydraFr/ansible-yunohost)
 [![GitHub Release Date](https://img.shields.io/github/release-date/LydraFr/ansible-yunohost)](https://github.com/LydraFr/ansible-yunohost)
 [![GitHub Repo stars](https://img.shields.io/github/stars/LydraFr/ansible-yunohost?style=social)](https://github.com/LydraFr/ansible-yunohost)

README.md

 [![](https://img.shields.io/liberapay/receives/cchaudier.svg?logo=liberapay)](https://liberapay.com/cchaudier/donate)
 [![](https://lab.frogg.it/lydra/yunohost/ansible-yunohost/badges/main/pipeline.svg)](https://lab.frogg.it/lydra/yunohost/ansible-yunohost/-/pipelines)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0)
-[![Ansible Role](https://img.shields.io/ansible/role/56544)](https://galaxy.ansible.com/lydra/yunohost)
-[![Ansible Quality Score](https://img.shields.io/ansible/quality/56544)](https://galaxy.ansible.com/lydra/yunohost)
-[![Ansible Role](https://img.shields.io/ansible/role/d/56544)](https://galaxy.ansible.com/lydra/yunohost)
+[![Ansible Collection](https://img.shields.io/ansible/collection/1838)](https://galaxy.ansible.com/lydra/yunohost)
 [![GitHub last commit](https://img.shields.io/github/last-commit/LydraFr/ansible-yunohost)](https://github.com/LydraFr/ansible-yunohost)
 [![GitHub Release Date](https://img.shields.io/github/release-date/LydraFr/ansible-yunohost)](https://github.com/LydraFr/ansible-yunohost)
 [![GitHub Repo stars](https://img.shields.io/github/stars/LydraFr/ansible-yunohost?style=social)](https://github.com/LydraFr/ansible-yunohost)

roles/ynh_backup/templates/ynh_backup.sh.j2

 #!/bin/bash
 today="$(date +%Y%m%d)"
 number_to_keep="{{ ynh_backup.number_days_to_keep | default("2") }}"
-old_backup_list="$(yunohost backup list --output-as plain | head -n -"$number_to_keep")"
+old_backup_list="$(yunohost backup list --output-as plain | head -n -${number_to_keep})"
 
 _good() {
     echo "SUCCESS: ${1}" && exit 0
@@ -12,16 +12,16 @@ _fail() {
 }
 
 _create_ynh_backup() {
-  echo "Backing up $today YunoHost data now."
-  yunohost backup create {% if ynh_backup.system | default(True) %}--system{% endif %}{% if ynh_backup.apps | default(True) %} --apps{% endif %}{% if ynh_backup.directory is defined %} --output-directory {{ ynh_backup.directory }}/backup_"$today" {% endif %} || _fail "can't create a backup"
-
+  echo "Backing up ${today} YunoHost data now."
+  yunohost backup create {% if ynh_backup.system | default(True) %}--system{% endif %}{% if ynh_backup.apps | default(True) %} --apps{% endif %}{% if ynh_backup.directory is defined %} --output-directory {{ ynh_backup.directory }}/backup_"${today}"{% endif %} || _fail "Can't create the local YunoHost backup"
 }
 
 _prune_old_backup() {
-  if [ -n "$old_backup_list" ]; then
-    for backup in $old_backup_list; do
-      echo "Backup $backup is 2 days old or more. Purging it now."
-      yunohost backup delete "$backup"
+  if [ -n "${old_backup_list}" ]; then
+    for backup in ${old_backup_list}; do
+      echo "Backup ${backup} is 2 days old or more. Purging it now."
+      yunohost backup delete "${backup}"
+      rm -rf {{ ynh_backup.directory }}/backup_"${backup}"
     done
     _good "Purging of old backups completed."
   else

roles/ynh_config/README-FR.md

@@ -50,6 +50,17 @@ Si des mises à jour sont disponibles, elles sont faites automatiquement. En cas
 
 Pour en savoir plus sur le fonctionnement des mises à jour dans Yunohost vous pouvez vous rendre [ici](https://yunohost.org/fr/update). Le changelog des versions de Yunohost est aussi disponible [ici](https://forum.yunohost.org/tag/ynh_release).
 
+### Modification du port SSH
+
+Parmi les paramètres proposés dans YunoHost, il est possible de modifier le port SSH. Vous devez juste créer la variable `ynh_ssh_port` et le rôle se chargera d'aller récupérer le port SSH et de le modifier si nécessaire. Il va aussi effectuer les changements appropriés pour fail2ban et le firewall interne de YunoHost.
+Si votre instance YunoHost est derrière un firewall applicatif ou propre à votre fournisseur cloud, il faudra également ouvrir le groupe de sécurité approprié.
+
+```yml
+ynh_ssh_port: "812"
+```
+
+⚠️ Attention, à partir du moment où le port SSH est modifié, la prochaine fois que vous voudrez vous connecter en SSH sur le serveur YunoHost, il faudra renseigner le port SSH utilisé (par exemple `ssh -p 812 username@hostname`). Vous pouvez également externaliser cette configuration vers un fichier de configuration SSH (plus d'infos [ici](https://linuxize.com/post/using-the-ssh-config-file/)). Vous pouvez aussi indiquer cette configuration dans votre fichier d'inventaire sinon Ansible ne pourra plus se connecter à votre serveur. (plus d'infos [ici](https://docs.ansible.com/ansible/latest/reference_appendices/faq.html#how-do-i-handle-different-machines-needing-different-user-accounts-or-ports-to-log-in-with)).
+
 ## Dépendances
 
 Aucune.

roles/ynh_config/README.md

@@ -50,6 +50,17 @@ If available, updates are done automatically. In case of problems following an a
 
 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).
 
+### SSH port modification
+
+Among the settings available in YunoHost, it is possible to change the SSH port. You just have to create the `ynh_ssh_port` variable and the role will retrieve the SSH port and modify it if necessary. It will also perform the adequate modifications regarding fail2ban and the internal firewall of YunoHost.
+In your YunoHost host is behind a firewall, you may consider creating the appropriate security group.
+
+``yml
+ynh_ssh_port: "812"
+```
+
+⚠️ Be careful, from the moment the SSH port is modified, the next time you want to connect to the YunoHost server with SSH, you will have to specify the SSH port to be used (for example `ssh -p 812 username@hostname`). You can also externalize this configuration to an SSH configuration file (more info [here](https://linuxize.com/post/using-the-ssh-config-file/)). You can indicate that configuration in your inventory file otherwise Ansible won't be able to connect to your server. (More info [here](https://docs.ansible.com/ansible/latest/reference_appendices/faq.html#how-do-i-handle-different-machines-needing-different-user-accounts-or-ports-to-log-in-with)).
+
 ## Dependencies
 
 None.

roles/ynh_config/defaults/main.yml

@@ -38,3 +38,5 @@ ynh_autoupdate:
   # apps: True
   # system: True
   # dest_script: "/usr/local/bin/"
+
+# ynh_ssh_port: "22"

roles/ynh_config/tasks/main.yml

@@ -26,9 +26,16 @@
     - yunohost
     - smtp
 
-- name: Configures Yunohost autoupdate
+- name: Configure Yunohost autoupdate
   ansible.builtin.include_tasks: autoupdate.yml
   when: ynh_autoupdate.scheduled
   tags:
     - yunohost
     - update
+
+- name: Configure Yunohost SSH port
+  ansible.builtin.include_tasks: sshd_configuration.yml
+  when: ynh_ssh_port
+  tags:
+    - yunohost
+    - ssh

roles/ynh_config/tasks/sshd_configuration.yml

+---
+#-----------------------------------------------------------------------------#
+# ansible-yunohost allows to deploy Yunohost using Ansible                    #
+# Copyright 2021-present Lydra https://www.lydra.fr/                          #
+#                                                                             #
+# this program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# this program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program. If not, see <http://www.gnu.org/licenses/>.        #
+#                                                                             #
+#-----------------------------------------------------------------------------#
+
+- name: Change SSH port
+  ansible.builtin.command:
+    "yunohost settings set security.ssh.port -v {{ ynh_ssh_port }}"
+  tags:
+    - yunohost
+    - ssh

roles/ynh_setup/README-FR.md

@@ -65,8 +65,7 @@ ynh_ignore_dyndns_server: False
 ynh_users:
    - name: user1
      pass: MYINSECUREPWD_PLZ_OVERRIDE_THIS
-     firstname: Jane
-     lastname: Doe
+     fullname: Jane DOE
      mail_domain: domain.tld 
 ```
 

roles/ynh_setup/README.md

@@ -65,8 +65,7 @@ ynh_ignore_dyndns_server: False
 ynh_users:
    - name: user1
      pass: MYINSECUREPWD_PLZ_OVERRIDE_THIS
-     firstname: Jane
-     lastname: Doe
+     fullname: Jane DOE
      mail_domain: domain.tld
 ```
 

roles/ynh_setup/defaults/main.yml

@@ -47,6 +47,5 @@ ynh_ignore_dyndns_server: False
 ynh_users: null
   # - name: user1
   #   pass: p@ssw0rd
-  #   firstname: Jane
-  #   lastname: Doe
+  #   fullname: Jane DOE
   #   mail_domain: domain.tld

roles/ynh_setup/tasks/users.yml

@@ -35,8 +35,7 @@
 - name: Create missing Yunohost users
   ansible.builtin.command:
     yunohost user create "{{ item.name }}" \
-    -f "{{ item.firstname }}" \
-    -l "{{ item.lastname }}" \
+    -F "{{ item.fullname }}" \
     -d "{{ item.mail_domain }}" \
     -p "{{ item.pass }}"
   loop: "{{ ynh_users }}"