From 208d7d603c8f81616a81d64240de990ab87145cb Mon Sep 17 00:00:00 2001
From: Mathieu Trossevin <mtrossevin+git@evolix.fr>
Date: Fri, 19 Jun 2020 14:23:00 +0200
Subject: [PATCH] [Cleanup] webapps

Probably the most dangerous part of the cleanup, replace call to the
shell module that don't seems to make use of shell features with the
command module.
---
 webapps/evoadmin-mail/tasks/nginx.yml | 2 +-
 webapps/roundcube/tasks/main.yml      | 2 +-
 webapps/wordpress/tasks/main.yml      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapps/evoadmin-mail/tasks/nginx.yml b/webapps/evoadmin-mail/tasks/nginx.yml
index 5ede64e7..ff335893 100644
--- a/webapps/evoadmin-mail/tasks/nginx.yml
+++ b/webapps/evoadmin-mail/tasks/nginx.yml
@@ -15,7 +15,7 @@
   tags:
     - evoadmin-mail
 
-- name: Active evoadminmail VHost     
+- name: Active evoadminmail VHost
   file:
     src: "/etc/nginx/sites-available/evoadminmail.conf"
     dest: "/etc/nginx/sites-enabled/evoadminmail.conf"
diff --git a/webapps/roundcube/tasks/main.yml b/webapps/roundcube/tasks/main.yml
index 2efd1823..cabbc242 100644
--- a/webapps/roundcube/tasks/main.yml
+++ b/webapps/roundcube/tasks/main.yml
@@ -116,7 +116,7 @@
     src: "/etc/nginx/sites-available/roundcube.conf"
     dest: "/etc/nginx/sites-enabled/roundcube.conf"
     state: link
-  when: roundcube_webserver == "nginx" 
+  when: roundcube_webserver == "nginx"
   notify: reload nginx
 
 - name: enable roundcube link in default site index
diff --git a/webapps/wordpress/tasks/main.yml b/webapps/wordpress/tasks/main.yml
index 6b6a67e2..c8bdb3f8 100644
--- a/webapps/wordpress/tasks/main.yml
+++ b/webapps/wordpress/tasks/main.yml
@@ -12,7 +12,7 @@
     mode: "0750"
 
 - name: Download Wordpress
-  shell: '{{ wordpress_wpcli }} core download --locale=fr_FR --version={{ wordpress_version }}'
+  command: '{{ wordpress_wpcli }} core download --locale=fr_FR --version={{ wordpress_version }}'
   args:
     creates: "{{ ansible_env.HOME }}/www/index.php"
 
@@ -42,12 +42,12 @@
   delegate_to: localhost
 
 - name: Configure Wordpress (wp-config.php)
-  shell: '{{ wordpress_wpcli }} core config --dbhost={{ db_host }} --dbuser={{ db_user }} --dbpass={{ db_pwd }} --dbname={{ db_name }}'
+  command: '{{ wordpress_wpcli }} core config --dbhost={{ db_host }} --dbuser={{ db_user }} --dbpass={{ db_pwd }} --dbname={{ db_name }}'
   args:
     creates: "{{ ansible_env.HOME }}/www/wp-config.php"
 
 - name: Configure site
-  shell: '{{ wordpress_wpcli }} core install --url={{ wordpress_host | quote }} --title={{ wordpress_title | quote }} --admin_user=admin --admin_password="{{ admin_pwd | quote }}" --admin_email={{ wordpress_email }} --skip-email'
+  command: '{{ wordpress_wpcli }} core install --url={{ wordpress_host | quote }} --title={{ wordpress_title | quote }} --admin_user=admin --admin_password="{{ admin_pwd | quote }}" --admin_email={{ wordpress_email }} --skip-email'
   changed_when: false
 
 - name: Check if Wordpress is up to date
@@ -58,7 +58,7 @@
   changed_when: check_version.rc
 
 - name: Update Wordpress
-  shell: '{{ wordpress_wpcli }} core update --version={{ wordpress_version }}'
+  command: '{{ wordpress_wpcli }} core update --version={{ wordpress_version }}'
   args:
     removes: "{{ ansible_env.HOME }}/www/index.php"
   when: check_version.rc