From 0abe03ad8b6146ac3b1810131e56d2ee5ce7f513 Mon Sep 17 00:00:00 2001
From: Arthur BOUDREAULT <arthur@lydra.fr>
Date: Tue, 28 Feb 2023 17:58:27 +0100
Subject: [PATCH] WIP: dictionnary for yunohost commands

---
 roles/ynh_config/README-FR.md                | 2 +-
 roles/ynh_config/README.md                   | 2 +-
 roles/ynh_config/defaults/main.yml           | 5 +++--
 roles/ynh_config/tasks/ssh_configuration.yml | 5 +++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/roles/ynh_config/README-FR.md b/roles/ynh_config/README-FR.md
index defa612..8d98649 100644
--- a/roles/ynh_config/README-FR.md
+++ b/roles/ynh_config/README-FR.md
@@ -68,7 +68,7 @@ A partir de Yunohost 11.1, un nouveau groupe d'administrateurs est créé sur l'
 Par défaut, l'utilisateur doit taper son mot de passe pour utiliser la commande sudo mais il est possible de désactiver cette vérification depuis l'interface web (`outils` > `Paramètres de YunoHost` > `Permettre aux administrateurs d'utiliser 'sudo' sans retaper leur mot de passe`) ou en modifiant la variable `ynh_sudo_passwordless` à `true` dans votre fichier de variables Ansible. Plus d'informations disponibles [ici](https://forum.yunohost.org/t/yunohost-11-1-release-sortie-de-yunohost-11-1/23378#sudo-sans-mot-de-passe-16).
 
 ```yml
-ynh_sudo_passwordless: false
+ynh_sudo_passwordless: "false"
 ```
 
 ## Dépendances
diff --git a/roles/ynh_config/README.md b/roles/ynh_config/README.md
index 6158190..9a5a9e5 100644
--- a/roles/ynh_config/README.md
+++ b/roles/ynh_config/README.md
@@ -68,7 +68,7 @@ Starting with Yunohost 11.1, a new administrator group is created on the instanc
 By default, the user must type their password to use the sudo command but it is possible to disable this check from the web interface (`tools` > `YunoHost settings` > `Allow admins to use ‘sudo’ without re-typing their passwords`) or by changing the `ynh_sudo_passwordless` variable to `true` in your Ansible variables file. More information available [here](https://forum.yunohost.org/t/yunohost-11-1-release-sortie-de-yunohost-11-1/23378#passwordless-sudo-4).
 
 ``yml
-ynh_sudo_passwordless: false
+ynh_sudo_passwordless: "false"
 ```
 
 ## Dependencies
diff --git a/roles/ynh_config/defaults/main.yml b/roles/ynh_config/defaults/main.yml
index b4a053f..af7aafb 100644
--- a/roles/ynh_config/defaults/main.yml
+++ b/roles/ynh_config/defaults/main.yml
@@ -39,5 +39,6 @@ ynh_autoupdate:
   # system: True
   # dest_script: "/usr/local/bin/"
 
-ynh_ssh_port:          "22"
-ynh_sudo_passwordless: false
+ynh_ssh_commands:
+  yunohost settings set security.ssh.port -v: "22"
+  yunohost settings set security.password.passwordless_sudo -v: "false"
diff --git a/roles/ynh_config/tasks/ssh_configuration.yml b/roles/ynh_config/tasks/ssh_configuration.yml
index a98b797..c563c52 100644
--- a/roles/ynh_config/tasks/ssh_configuration.yml
+++ b/roles/ynh_config/tasks/ssh_configuration.yml
@@ -31,3 +31,8 @@
   tags:
     - yunohost
     - ssh
+
+- name: (WIP) YunoHost commands
+  ansible.builtin.command:
+    "{{ item.key }} {{ item.value }}"
+  loop: "{{ ynh_ssh_commands | dict2items }}"
-- 
GitLab