Quellcode durchsuchen

Fixes for Ansible 2.0; detect CEST as CET

Markus Lindenberg vor 9 Jahren
Ursprung
Commit
66e454332d

+ 1 - 1
roles/common-system/tasks/time.yml

@@ -5,4 +5,4 @@
 
 - name: ensure timezone is set to CET
   command: timedatectl set-timezone CET
-  when: ansible_date_time.tz != "CET"
+  when: ansible_date_time.tz not in ['CET','CEST']

+ 1 - 3
roles/mesh-vpn-fastd/tasks/fastd.yml

@@ -24,9 +24,7 @@
   notify: Restart fastd
 
 - name: Create fastd secrets
-  copy: 
-    content: 'secret "{{item.secret}}";\n'
-    dest: /etc/fastd/{{item.name}}/secret.conf
+  template: src=secret.conf.j2 dest=/etc/fastd/{{item.name}}/secret.conf
   with_items: "{{fastd_instances}}"
   notify: Restart fastd
 

+ 1 - 0
roles/mesh-vpn-fastd/templates/secret.conf.j2

@@ -0,0 +1 @@
+secret "{{item.secret}}";