From 78f202b11f14d91637a9f5f31c7579f21292426e Mon Sep 17 00:00:00 2001 From: Adrien Reslinger Date: Sat, 30 Jul 2022 12:35:42 +0200 Subject: [PATCH] Update template --- defaults/main.yml | 2 ++ templates/etc/wireguard/wireguard.conf.j2 | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index a15fd46..c251e33 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,5 +13,7 @@ wireguard_port: 51820 # wireguard_postdown: wireguard_persistent_keepalive: 20 wireguard_save_config: true +# wireguard_endpoint_port: "51820" +# wireguard_endpoint_ip: "x.x.x.x" skip_conf: false diff --git a/templates/etc/wireguard/wireguard.conf.j2 b/templates/etc/wireguard/wireguard.conf.j2 index f7d0610..73d1e6c 100644 --- a/templates/etc/wireguard/wireguard.conf.j2 +++ b/templates/etc/wireguard/wireguard.conf.j2 @@ -53,7 +53,13 @@ AllowedIPs = {{hostvars[host].wireguard_allowed_ips}} {% else %} AllowedIPs = {{ hostvars[host].wireguard_address.split('/')[0] }}/32 {% endif %} +{% if hostvars[host].wireguard_endpoint_ip is defined and hostvars[host].wireguard_endpoint_port is defined %} +Endpoint = {{ hostvars[host].wireguard_endpoint_ip }}:{{ hostvars[host].wireguard_endpoint_port }} +{% elif hostvars[host].wireguard_endpoint_ip is defined %} +Endpoint = {{ hostvars[host].wireguard_endpoint_ip }}:{{ hostvars[host].wireguard_port }} +{% else %} Endpoint = {{ hostvars[host].ansible_default_ipv4.address }}:{{ wireguard_port }} +{% endif %} {% if hostvars[host].wireguard_persistent_keepalive is defined %} PersistentKeepalive = {{hostvars[host].wireguard_persistent_keepalive}} {% endif %}