From 0185d95da67aa462e05e452a53526c12033d948e Mon Sep 17 00:00:00 2001
From: rodeodomino <48391143+rodeodomino@users.noreply.github.com>
Date: Sat, 18 May 2019 12:13:52 -0400
Subject: [PATCH] Switching out ipv6 address with local_service_ipv6 variable
 from #1429

---
 config.cfg                                            | 2 +-
 roles/dns_adblocking/templates/dnsmasq.conf.j2        | 2 +-
 roles/dns_encryption/templates/dnscrypt-proxy.toml.j2 | 2 +-
 roles/strongswan/templates/ipsec.conf.j2              | 2 +-
 roles/wireguard/defaults/main.yml                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.cfg b/config.cfg
index a652749f..440fb804 100644
--- a/config.cfg
+++ b/config.cfg
@@ -122,7 +122,7 @@ congrats:
     "#    Config files and certificates are in the ./configs/ directory.    #"
     "#              Go to https://whoer.net/ after connecting               #"
     "#        and ensure that all your traffic passes through the VPN.      #"
-    "#                     Local DNS resolver {{ local_service_ip }}                    #"
+    "#                     Local DNS resolver {{ local_service_ip }}{{ ', ' + {{ local_service_ipv6 }}  if ipv6_support else '' }}                   #"
   p12_pass: |
     "#        The p12 and SSH keys password for new users is {{ p12_export_password }}       #"
   ca_key_pass: |
diff --git a/roles/dns_adblocking/templates/dnsmasq.conf.j2 b/roles/dns_adblocking/templates/dnsmasq.conf.j2
index d1b58a5c..2147b914 100644
--- a/roles/dns_adblocking/templates/dnsmasq.conf.j2
+++ b/roles/dns_adblocking/templates/dnsmasq.conf.j2
@@ -91,7 +91,7 @@ no-resolv
 {% if dns_encryption %}
 server={{ local_service_ip }}#5353
 {% if ipv6_support -%}
-server=FCAA::1#5353
+server={{ local_service_ipv6 }}#5353
 {% endif %}
 {% else %}
 {% for host in dns_servers.ipv4 %}
diff --git a/roles/dns_encryption/templates/dnscrypt-proxy.toml.j2 b/roles/dns_encryption/templates/dnscrypt-proxy.toml.j2
index 3c444afd..a084a9d2 100644
--- a/roles/dns_encryption/templates/dnscrypt-proxy.toml.j2
+++ b/roles/dns_encryption/templates/dnscrypt-proxy.toml.j2
@@ -37,7 +37,7 @@
 ## List of local addresses and ports to listen to. Can be IPv4 and/or IPv6.
 ## Note: When using systemd socket activation, choose an empty set (i.e. [] ).
 
-listen_addresses  = ['{{ local_service_ip }}:{{ listen_port }}'{% if ipv6_support %}, '[FCAA::1]:{{ listen_port }}'{% endif %}]
+listen_addresses  = ['{{ local_service_ip }}:{{ listen_port }}'{% if ipv6_support %}, '[{{ local_service_ipv6 }}]:{{ listen_port }}'{% endif %}]
 
 
 ## Maximum number of simultaneous client connections to accept
diff --git a/roles/strongswan/templates/ipsec.conf.j2 b/roles/strongswan/templates/ipsec.conf.j2
index 1c1711ad..0549dd62 100644
--- a/roles/strongswan/templates/ipsec.conf.j2
+++ b/roles/strongswan/templates/ipsec.conf.j2
@@ -31,7 +31,7 @@ conn %default
     rightauth=pubkey
     rightsourceip={{ strongswan_network }},{{ strongswan_network_ipv6 }}
 {% if algo_local_dns or dns_encryption %}
-    rightdns={{ local_service_ip }}{{ ",FCAA::1"  if ipv6_support else '' }}
+    rightdns={{ local_service_ip }}{{ ',' + {{ local_service_ipv6 }}  if ipv6_support else '' }}
 {% else %}
     rightdns={% for host in dns_servers.ipv4 %}{{ host }}{% if not loop.last %},{% endif %}{% endfor %}{% if ipv6_support %},{% for host in dns_servers.ipv6 %}{{ host }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}
 {% endif %}
diff --git a/roles/wireguard/defaults/main.yml b/roles/wireguard/defaults/main.yml
index 6fd733c0..64ecb161 100644
--- a/roles/wireguard/defaults/main.yml
+++ b/roles/wireguard/defaults/main.yml
@@ -6,7 +6,7 @@ wireguard_interface: wg0
 keys_clean_all: false
 wireguard_dns_servers: >-
   {% if local_dns|default(false)|bool or dns_encryption|default(false)|bool %}
-  {{ local_service_ip }}{{ ", FCAA::1"  if ipv6_support else '' }}
+  {{ local_service_ip }}{{ ', ' + {{ local_service_ipv6 }} if ipv6_support else '' }}
   {% else %}
   {% for host in dns_servers.ipv4 %}{{ host }}{% if not loop.last %},{% endif %}{% endfor %}{% if ipv6_support %},{% for host in dns_servers.ipv6 %}{{ host }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}
   {% endif %}