projects
/
noc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixup! roles/openwrt-image: Add support for setting file 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
e049983
..
bf09f31
100644
(file)
--- a/
ansible/roles/openwrt-image/tasks/prepare.yml
+++ b/
ansible/roles/openwrt-image/tasks/prepare.yml
@@
-18,21
+18,21
@@
- name: Copy mixins in place [1/2]
copy:
- name: Copy mixins in place [1/2]
copy:
- src: "{{ item.file }}"
+ src: "{{ item.value.file }}"
dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
- mode: "{{ item.mode | default(0644) }}"
+ mode: "{{ item.value.mode | default('0644') }}"
with_dict: "{{ openwrt_mixin }}"
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:
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 }}"
dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
- mode: "{{ item.mode | default(0644) }}"
+ mode: "{{ item.value.mode | default('0644') }}"
with_dict: "{{ openwrt_mixin }}"
with_dict: "{{ openwrt_mixin }}"
- when: '"content" in item'
+ when: '"content" in item.value'
loop_control:
label: "{{ item.key }}"
loop_control:
label: "{{ item.key }}"