roles/openwrt-image: Fixup directory modes

[noc.git] / ansible / roles / openwrt-image / tasks / prepare.yml

diff --git a/ansible/roles/openwrt-image/tasks/prepare.yml b/ansible/roles/openwrt-image/tasks/prepare.yml
index b697e39..7ed93d0 100644 (file)
--- a/ansible/roles/openwrt-image/tasks/prepare.yml
+++ b/ansible/roles/openwrt-image/tasks/prepare.yml
@@ -11,6 +11,7 @@
   file:
     path: "{{ item }}"
     state: directory
+    mode: '0755'
   with_items:
     - "{{ openwrt_imgbuilder_files }}/etc/config"
     - "{{ openwrt_mixin | map('dirname') | map('regex_replace', '^', openwrt_imgbuilder_files) | unique | list }}"
@@ -18,24 +19,35 @@
 
 - name: Copy mixins in place [1/2]
   copy:
-    src: "{{ item.file }}"
+    src: "{{ item.value.file }}"
     dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
-    mode: "{{ item.mode | default(0644) }}"
+    mode: "{{ item.value.mode | default('0644') }}"
   with_dict: "{{ openwrt_mixin }}"
-  when: '"file" in item'
+  when: '"file" in item.value'
   loop_control:
     label: "{{ item.key }}"
 
 - name: Copy mixins in place [2/2]
   copy:
-    content: "{{ item.value }}"
+    content: "{{ item.value.content }}"
     dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
-    mode: "{{ item.mode | default(0644) }}"
+    mode: "{{ item.value.mode | default('0644') }}"
   with_dict: "{{ openwrt_mixin }}"
-  when: '"content" in item'
+  when: '"content" in item.value'
   loop_control:
     label: "{{ item.key }}"
 
+- name: Generate /etc/fstab
+  mount:
+    fstab: "{{ openwrt_imgbuilder_files }}/etc/fstab"
+    state: present
+  args:
+    "{{ item }}"
+  when: openwrt_mounts is defined
+  with_items: "{{ openwrt_mounts }}"
+  loop_control:
+    label: "{{ item.path }}"
+
 - name: Create UCI configuration files
   template:
     src: uci.j2
@@ -47,6 +59,21 @@
   loop_control:
     label: "{{ item.key }}"
 
+- name: Create /etc/passwd
+  template:
+    src: passwd.j2
+    dest: "{{ openwrt_imgbuilder_files }}/etc/passwd"
+    mode: 0644
+    trim_blocks: yes
+  when: openwrt_users is defined
+
+- name: Create /etc/group
+  template:
+    src: group.j2
+    dest: "{{ openwrt_imgbuilder_files }}/etc/group"
+    mode: 0644
+    trim_blocks: yes
+  when: openwrt_groups is defined or openwrt_users is defined
 
 ### TODO: this just hangs?
 # - unarchive: