more zsh fixes

alphanodes · Apr 17, 2024 · ffdb69a · ffdb69a
1 parent 53663de
commit ffdb69a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/roles/drupal/tasks/instance.yml b/roles/drupal/tasks/instance.yml
@@ -9,6 +9,14 @@
     zsh_user_home: '{{ instance.dir }}'
   when: drupal_with_zsh and instance.drupal_user is defined
 
+- name: Set drupal home dir permission - {{ instance.name }}
+  ansible.builtin.file:
+    path: '{{ instance.dir }}{{ item }}'
+    owner: '{{ instance.drupal_user }}'
+    group: '{{ instance.drupal_group | default(nginx_group) }}'
+    state: directory
+  when: instance.drupal_user is defined and instance.drupal_user != 'root'
+
 - name: Include mysql tasks
   ansible.builtin.include_tasks: instance_mysql.yml
   tags: mysql

diff --git a/roles/zsh/tasks/setup.yml b/roles/zsh/tasks/setup.yml
@@ -37,9 +37,3 @@
     src: auto-ls.zsh
     dest: '{{ auto_ls_plugin_file }}'
     mode: 0644
-
-- name: Set zsh as default shell
-  user:
-    name: "{{ ansible_user | default(ansible_env.USER) }}"
-    shell: /usr/bin/zsh
-  when: zsh_default_shell
diff --git a/roles/zsh/tasks/zshrc.yml b/roles/zsh/tasks/zshrc.yml
@@ -16,3 +16,9 @@
   ignore_errors: true
   become: true
   become_user: '{{ zsh_user }}'
+
+- name: Set zsh as default shell
+  user:
+    name: "{{ ansible_user | default(ansible_env.USER) }}"
+    shell: /usr/bin/zsh
+  when: zsh_default_shell