Merge branch 'drybjed-fix-sigpipe-error'

debops · Feb 15, 2019 · 7299470 · 7299470
2 parents 8fe23f9 + 7764af6
commit 7299470
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ansible/roles/debops.ferm/defaults/main.yml b/ansible/roles/debops.ferm/defaults/main.yml
@@ -18,9 +18,10 @@
 # Enable or disable :command:`iptables` management by checking if ``cap_net_admin``
 # POSIX capability is set on the host.
 ferm__enabled: '{{ True
-                   if (((ansible_system_capabilities_enforced|d())|bool and
-                        "cap_net_admin" in ansible_system_capabilities) or
-                       not (ansible_system_capabilities_enforced|d(True))|bool)
+                   if (ansible_system_capabilities is undefined or
+                       (((ansible_system_capabilities_enforced|d())|bool and
+                         "cap_net_admin" in ansible_system_capabilities) or
+                        not (ansible_system_capabilities_enforced|d(True))|bool))
                    else False }}'
 
                                                                    # ]]]

diff --git a/ansible/roles/debops.tinc/tasks/main.yml b/ansible/roles/debops.tinc/tasks/main.yml
@@ -158,8 +158,8 @@
 
 - name: Initialize RSA key pairs
   shell: set -o nounset -o pipefail -o errexit &&
-         yes | tincd -n {{ item.value.name | d(item.key) }}
-                     -K {{ item.value.rsa_key_length | d(tinc__rsa_key_length) }}
+         sh -c 'yes || true' | tincd -n {{ item.value.name | d(item.key) }}
+                                     -K {{ item.value.rsa_key_length | d(tinc__rsa_key_length) }}
   args:
     executable: '/bin/bash'
     creates: '/etc/tinc/{{ item.value.name | d(item.key) }}/rsa_key.priv'