From 716543e1f1c28eef2ad96eea206468dec80d76b3 Mon Sep 17 00:00:00 2001 From: owine Date: Mon, 9 Sep 2024 10:44:07 -0500 Subject: [PATCH] Wireguard: Add ENVs in preparation for deprecation --- roles/gluetun/defaults/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/roles/gluetun/defaults/main.yml b/roles/gluetun/defaults/main.yml index 7baa079f69..f92358afdd 100644 --- a/roles/gluetun/defaults/main.yml +++ b/roles/gluetun/defaults/main.yml @@ -21,11 +21,16 @@ gluetun_instances: ["gluetun"] gluetun_vpn_service_provider: "" gluetun_vpn_type: "" gluetun_openvpn_custom_config: "" +gluetun_openvpn_endpoint_ip: "" +gluetun_openvpn_endpoint_port: "" gluetun_openvpn_user: "" gluetun_openvpn_password: "" gluetun_openvpn_key_passphrase: "" gluetun_vpn_endpoint_ip: "" gluetun_vpn_endpoint_port: "" +gluetun_wireguard_endpoint_ip: "" +gluetun_wireguard_endpoint_port: "" +gluetun_wireguard_mtu: "" gluetun_wireguard_public_key: "" gluetun_wireguard_private_key: "" gluetun_wireguard_preshared_key: "" @@ -78,6 +83,8 @@ gluetun_docker_envs_default: HTTPPROXY: "on" HTTPPROXY_STEALTH: "on" OPENVPN_CUSTOM_CONFIG: "{{ lookup('vars', gluetun_name + '_openvpn_custom_config', default='') if (lookup('vars', gluetun_name + '_openvpn_custom_config', default='') | length > 0) else omit }}" + OPENVPN_ENDPOINT_IP: "{{ lookup('vars', gluetun_name + '_openvpn_endpoint_ip', default='') if (lookup('vars', gluetun_name + '_openvpn_endpoint_ip', default='') | length > 0) else omit }}" + OPENVPN_ENDPOINT_PORT: "{{ lookup('vars', gluetun_name + '_openvpn_endpoint_port', default='') if (lookup('vars', gluetun_name + '_openvpn_endpoint_port', default='') | length > 0) else omit }}" OPENVPN_KEY_PASSPHRASE: "{{ lookup('vars', gluetun_name + '_openvpn_key_passphrase', default='') if (lookup('vars', gluetun_name + '_openvpn_key_passphrase', default='') | length > 0) else omit }}" OPENVPN_PASSWORD: "{{ lookup('vars', gluetun_name + '_openvpn_password', default='') if (lookup('vars', gluetun_name + '_openvpn_password', default='') | length > 0) else omit }}" OPENVPN_USER: "{{ lookup('vars', gluetun_name + '_openvpn_user', default='') if (lookup('vars', gluetun_name + '_openvpn_user', default='') | length > 0) else omit }}" @@ -94,6 +101,9 @@ gluetun_docker_envs_default: VPN_SERVICE_PROVIDER: "{{ lookup('vars', gluetun_name + '_vpn_service_provider', default='') if (lookup('vars', gluetun_name + '_vpn_service_provider', default='') | length > 0) else omit }}" VPN_TYPE: "{{ lookup('vars', gluetun_name + '_vpn_type', default='') if (lookup('vars', gluetun_name + '_vpn_type', default='') | length > 0) else omit }}" WIREGUARD_ADDRESSES: "{{ lookup('vars', gluetun_name + '_wireguard_addresses', default='') if (lookup('vars', gluetun_name + '_wireguard_addresses', default='') | length > 0) else omit }}" + WIREGUARD_ENDPOINT_IP: "{{ lookup('vars', gluetun_name + '_wireguard_endpoint_ip', default='') if (lookup('vars', gluetun_name + '_wireguard_endpoint_ip', default='') | length > 0) else omit }}" + WIREGUARD_ENDPOINT_PORT: "{{ lookup('vars', gluetun_name + '_wireguard_endpoint_port', default='') if (lookup('vars', gluetun_name + '_wireguard_endpoint_port', default='') | length > 0) else omit }}" + WIREGUARD_MTU: "{{ lookup('vars', gluetun_name + '_wireguard_mtu', default='') if (lookup('vars', gluetun_name + '_wireguard_mtu', default='') | length > 0) else omit }}" WIREGUARD_PRESHARED_KEY: "{{ lookup('vars', gluetun_name + '_wireguard_preshared_key', default='') if (lookup('vars', gluetun_name + '_wireguard_preshared_key', default='') | length > 0) else omit }}" WIREGUARD_PRIVATE_KEY: "{{ lookup('vars', gluetun_name + '_wireguard_private_key', default='') if (lookup('vars', gluetun_name + '_wireguard_private_key', default='') | length > 0) else omit }}" WIREGUARD_PUBLIC_KEY: "{{ lookup('vars', gluetun_name + '_wireguard_public_key', default='') if (lookup('vars', gluetun_name + '_wireguard_public_key', default='') | length > 0) else omit }}"