handlers/main.yml

@@ -21,8 +21,3 @@
     executable: "/bin/bash"
   when: wg_syncconf and not wireguard_containerized
   listen: "reconfigure wireguard"
-
-- name: restart wireguard (container)
-  command: s6-svc -r /var/run/s6/services/wireguard
-  when: wireguard_containerized
-  listen: "reconfigure wireguard"

templates/wg.conf.j2

@@ -40,31 +40,31 @@ PostDown = {{ wg_postdown }}
 SaveConfig = true
 {% endif %}
 {% for host in ansible_play_hosts_all %}
-{% if host != inventory_hostname %}
-
-[Peer]
-# {{ host }}
-PublicKey = {{hostvars[host].public_key}}
-{% if hostvars[host].wireguard_allowed_ips is defined %}
-AllowedIPs = {{hostvars[host].wireguard_allowed_ips}}
-{% else %}
-AllowedIPs = {{hostvars[host].wireguard_ip}}/32
-{% endif %}
-{% if hostvars[host].wireguard_persistent_keepalive is defined %}
-PersistentKeepalive = {{hostvars[host].wireguard_persistent_keepalive}}
-{% endif %}
-{% if hostvars[host].wireguard_port is defined and hostvars[host].wireguard_port is number %}
-{% if hostvars[host].wireguard_endpoint is defined and hostvars[host].wireguard_endpoint != "" %}
-Endpoint = {{hostvars[host].wireguard_endpoint}}:{{hostvars[host].wireguard_port}}
-{% else %}
-Endpoint = {{host}}:{{hostvars[host].wireguard_port}}
-{% endif %}
-{% elif hostvars[host].wireguard_endpoint is defined and hostvars[host].wireguard_endpoint != "" %}
-Endpoint = {{hostvars[host].wireguard_endpoint}}:{{wireguard_port}}
-{% elif hostvars[host].wireguard_endpoint == "" %}
-# No endpoint defined for this peer
-{% else %}
-Endpoint = {{host}}:{{wireguard_port}}
-{% endif %}
-{% endif %}
+  {% if host != inventory_hostname %}
+  
+    [Peer]
+    # {{ host }}
+    PublicKey = {{hostvars[host].public_key}}
+    {% if hostvars[host].wireguard_allowed_ips is defined %}
+    AllowedIPs = {{hostvars[host].wireguard_allowed_ips}}
+    {% else %}
+    AllowedIPs = {{hostvars[host].wireguard_ip}}/32
+    {% endif %}
+    {% if hostvars[host].wireguard_persistent_keepalive is defined %}
+    PersistentKeepalive = {{hostvars[host].wireguard_persistent_keepalive}}
+    {% endif %}
+    {% if hostvars[host].wireguard_port is defined and hostvars[host].wireguard_port is number %}
+      {% if hostvars[host].wireguard_endpoint is defined and hostvars[host].wireguard_endpoint != "" %}
+    Endpoint = {{hostvars[host].wireguard_endpoint}}:{{hostvars[host].wireguard_port}}
+      {% else %}
+    Endpoint = {{host}}:{{hostvars[host].wireguard_port}}
+      {% endif %}
+    {% elif hostvars[host].wireguard_endpoint is defined and hostvars[host].wireguard_endpoint != "" %}
+    Endpoint = {{hostvars[host].wireguard_endpoint}}:{{wireguard_port}}
+    {% elif hostvars[host].wireguard_endpoint == "" %}
+    # No endpoint defined for this peer
+    {% else %}
+    Endpoint = {{host}}:{{wireguard_port}}
+    {% endif %}
+  {% endif %}
 {% endfor %}