Switching out ipv6 address with local_service_ipv6 variable from #1429

This commit is contained in:
rodeodomino 2019-05-18 12:13:52 -04:00
parent 44217dccf2
commit 0185d95da6
5 changed files with 5 additions and 5 deletions

View file

@ -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: |

View file

@ -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 %}

View file

@ -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

View file

@ -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 %}

View file

@ -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 %}