wallenstein/algo
1
0
Fork 0
mirror of https://github.com/trailofbits/algo.git synced 2025-09-06 20:13:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge 3781383888 into aea9c9a5e2

Browse source
This commit is contained in:
Jack Ivanov 2018-03-27 18:53:59 +00:00 • committed by GitHub
commit 5957b38cfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/dns_adblocking/templates/dnsmasq.conf.j2
View file

@ -88,7 +88,7 @@ no-resolv
# You can control how dnsmasq talks to a server: this forces # You can control how dnsmasq talks to a server: this forces
# queries to 10.1.2.3 to be routed via eth1 # queries to 10.1.2.3 to be routed via eth1
# server=10.1.2.3@eth1 # server=10.1.2.3@eth1
{% for host in dns_servers.ipv4 %} {% for host in ansible_dns['nameservers']|default(dns_servers['ipv4']) %}
server={{ host }} server={{ host }}
{% endfor %} {% endfor %}

2
roles/vpn/templates/ipsec.conf.j2
View file

@ -31,7 +31,7 @@ conn %default
{% if local_dns is defined and local_dns == "Y" %} {% if local_dns is defined and local_dns == "Y" %}
rightdns={{ local_service_ip }} rightdns={{ local_service_ip }}
{% else %} {% else %}
rightdns={% for host in dns_servers.ipv4 %}{{ host }}{% if not loop.last %},{% endif %}{% endfor %}{% if ipv6_support is defined and ipv6_support == "yes" %},{% for host in dns_servers.ipv6 %}{{ host }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %} rightdns={% for host in ansible_dns['nameservers']|default(dns_servers['ipv4']) %}{{ host }}{% if not loop.last %},{% endif %}{% endfor %}
{% endif %} {% endif %}
conn ikev2-pubkey conn ikev2-pubkey