From 0be45939fc2a5cff879ae2f5887bdae86e9c7cf2 2024-09-03 15:42:49
From: Branko Majic <branko@majic.rs>
Date: 2024-09-03 15:42:49
Subject: [PATCH] MAR-218: Fix erroneous replacement of shell attribute (from FQCN fixes).

---

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index d46c144af2bf070bfba9447ce9f6708863cdc171..16e7db5ca3f81f9d694547f80a2c8f7f051733ba 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -163,7 +163,7 @@
     group: "{{ item.name }}"
     groups: "{{ ','.join(item.additional_groups | default([])) }}"
     append: true
-    ansible.builtin.shell: /bin/bash
+    shell: /bin/bash
     state: present
     password: "{{ item.password | default('!') }}"
     update_password: on_create
diff --git a/roles/php_website/tasks/main.yml b/roles/php_website/tasks/main.yml
index 79badd10eecaab00605bc0aec986ccaff6d9977e..80bc8a2581e020ed57b7e0f66b3451e2ae86cf9d 100644
--- a/roles/php_website/tasks/main.yml
+++ b/roles/php_website/tasks/main.yml
@@ -11,7 +11,7 @@
     name: "{{ admin }}"
     uid: "{{ admin_uid | default(omit) }}"
     group: "{{ user }}"
-    ansible.builtin.shell: /bin/bash
+    shell: /bin/bash
     createhome: true
     home: "{{ home }}"
     state: present
@@ -37,7 +37,7 @@
     # This is a workaround for a rather stupid bug that Debian seems
     # uninterested to backport -
     # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=865762
-    ansible.builtin.shell: /bin/sh
+    shell: /bin/sh
 
 - name: Add nginx user to website group
   ansible.builtin.user:
diff --git a/roles/wsgi_website/tasks/main.yml b/roles/wsgi_website/tasks/main.yml
index bc3d8493041e42bbf38218b8ecc5ef5e791c310c..2cd1d327db0a259856907721405c7fb974f8eb10 100644
--- a/roles/wsgi_website/tasks/main.yml
+++ b/roles/wsgi_website/tasks/main.yml
@@ -11,7 +11,7 @@
     name: "{{ admin }}"
     uid: "{{ admin_uid | default(omit) }}"
     group: "{{ user }}"
-    ansible.builtin.shell: /bin/bash
+    shell: /bin/bash
     createhome: true
     home: "{{ home }}"
     state: present
@@ -53,7 +53,7 @@
     # This is a workaround for a rather stupid bug that Debian seems
     # uninterested to backport -
     # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=865762
-    ansible.builtin.shell: /bin/sh
+    shell: /bin/sh
 
 - name: Add nginx user to website group
   ansible.builtin.user:
diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml
index df67a15fa60aae0cdd7dd56b5a46627dc45ff5da..fb2465aa17e5353492bebbc7f4e4377a76d0efca 100644
--- a/roles/xmpp_server/molecule/default/prepare.yml
+++ b/roles/xmpp_server/molecule/default/prepare.yml
@@ -151,7 +151,7 @@
       ansible.builtin.user:
         name: user
         group: user
-        ansible.builtin.shell: /bin/bash
+        shell: /bin/bash
 
     - name: Deploy mcabber configuration files
       ansible.builtin.template: