Ansible 2 fixes

Oefenweb · Jun 1, 2016 · c2b5edb · c2b5edb
1 parent e1ecb5b
commit c2b5edb
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 23 deletions.
diff --git a/tasks/configuration.yml b/tasks/configuration.yml
@@ -7,8 +7,11 @@
     owner: root
     group: root
     mode: 0700
-  with_dict: duply_backup_profiles
-  tags: [configuration, duply-backup, duply-backup-profile]
+  with_dict: "{{ duply_backup_profiles }}"
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-profile
 
 - name: configure configuration files
   template:
@@ -17,16 +20,24 @@
     owner: root
     group: root
     mode: 0600
-  with_dict: duply_backup_profiles
-  tags: [configuration, duply-backup, duply-backup-profile, duply-backup-profile-conf]
+  with_dict: "{{ duply_backup_profiles }}"
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-profile
+    - duply-backup-profile-conf
 
 - name: remove obsolete pre scripts
   file:
     path: "{{ duply_backup_profile_directory }}/{{ item.key }}/pre"
     state: absent
-  with_dict: duply_backup_profiles
+  with_dict: "{{ duply_backup_profiles }}"
   when: item.value.pre is not defined or not item.value.pre
-  tags: [configuration, duply-backup, duply-backup-profile, duply-backup-profile-pre]
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-profile
+    - duply-backup-profile-pre
 
 - name: copy pre scripts
   copy:
@@ -35,17 +46,25 @@
     owner: root
     group: root
     mode: 0700
-  with_dict: duply_backup_profiles
+  with_dict: "{{ duply_backup_profiles }}"
   when: item.value.pre is defined and item.value.pre
-  tags: [configuration, duply-backup, duply-backup-profile, duply-backup-profile-pre]
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-profile
+    - duply-backup-profile-pre
 
 - name: remove obsolete post scripts
   file:
     path: "{{ duply_backup_profile_directory }}/{{ item.key }}/post"
     state: absent
-  with_dict: duply_backup_profiles
+  with_dict: "{{ duply_backup_profiles }}"
   when: item.value.post is not defined or not item.value.post
-  tags: [configuration, duply-backup, duply-backup-profile, duply-backup-profile-post]
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-profile
+    - duply-backup-profile-post
 
 - name: copy post scripts
   copy:
@@ -54,9 +73,13 @@
     owner: root
     group: root
     mode: 0700
-  with_dict: duply_backup_profiles
+  with_dict: "{{ duply_backup_profiles }}"
   when: item.value.post is defined and item.value.post
-  tags: [configuration, duply-backup, duply-backup-profile, duply-backup-profile-post]
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-profile
+    - duply-backup-profile-post
 
 - name: configure exclude files
   template:
@@ -65,5 +88,9 @@
     owner: root
     group: root
     mode: 0600
-  with_dict: duply_backup_profiles
-  tags: [configuration, duply-backup, duply-backup-profile, duply-backup-profile-exclude]
+  with_dict: "{{ duply_backup_profiles }}"
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-profile
+    - duply-backup-profile-exclude
diff --git a/tasks/gpg.yml b/tasks/gpg.yml
@@ -7,26 +7,41 @@
     owner: root
     group: root
     mode: 0755
-  tags: [configuration, duply-backup, duply-backup-gpg]
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-gpg
 
 - name: import public keys
   shell: "echo '{{ lookup('file', item) }}' | gpg --import && touch {{ duply_backup_lock_directory }}/{{ item | basename }}"
   args:
     creates: "{{ duply_backup_lock_directory }}/{{ item | basename }}"
-  with_items: duply_backup_gpg_pub_keys
-  tags: [configuration, duply-backup, duply-backup-gpg, duply-backup-gpg-pub-import]
+  with_items: "{{ duply_backup_gpg_pub_keys }}"
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-gpg
+    - duply-backup-gpg-pub-import
 
 - name: import ownertrusts
   shell: "echo '{{ lookup('file', item) }}' | gpg --import-ownertrust && touch {{ duply_backup_lock_directory }}/{{ item | basename }}"
   args:
     creates: "{{ duply_backup_lock_directory }}/{{ item | basename }}"
   notify: update trustdb
-  with_items: duply_backup_gpg_ownertrusts
-  tags: [configuration, duply-backup, duply-backup-gpg, duply-backup-gpg-ownertrust-import]
+  with_items: "{{ duply_backup_gpg_ownertrusts }}"
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-gpg
+    - duply-backup-gpg-ownertrust-import
 
 - name: import private keys
   shell: "echo '{{ lookup('file', item) }}' | gpg --allow-secret-key-import --import && touch {{ duply_backup_lock_directory }}/{{ item | basename }}"
   args:
     creates: "{{ duply_backup_lock_directory }}/{{ item | basename }}"
-  with_items: duply_backup_gpg_sec_keys
-  tags: [configuration, duply-backup, duply-backup-gpg, duply-backup-gpg-sec-import]
+  with_items: "{{ duply_backup_gpg_sec_keys }}"
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-gpg
+    - duply-backup-gpg-sec-import
diff --git a/tasks/jobs.yml b/tasks/jobs.yml
@@ -12,5 +12,8 @@
     weekday: "{{ item.weekday | default('*') }}"
     cron_file: duply-backup
     user: root
-  with_items: duply_backup_jobs
-  tags: [configuration, duply-backup, duply-backup-jobs]
+  with_items: "{{ duply_backup_jobs }}"
+  tags:
+    - configuration
+    - duply-backup
+    - duply-backup-jobs