external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1318 from holta/dnsmasq+systemd-resolved

Browse source 
Allow systemd-resolved AND dnsmasq to work (for Ubuntu especially)
This commit is contained in:
A Holt 2018-12-03 03:09:11 -05:00 committed by GitHub
commit b306347e3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/network/tasks/dnsmasq.yml
View file

@ -3,6 +3,11 @@
name: dnsmasq name: dnsmasq
state: present state: present
- name: Install /etc/dnsmasq.d/dnsmasq-iiab, allowing systemd-resolved AND dnsmasq to work (#1306)
template:
src: roles/network/templates/network/dnsmasq-iiab
dest: /etc/dnsmasq.d/dnsmasq-iiab
#- name: Stop dnsmasq #- name: Stop dnsmasq
# service: # service:
# name: dnsmasq # name: dnsmasq

1
roles/network/tasks/named.yml
View file

@ -104,3 +104,4 @@
systemd: systemd:
name: "{{ dns_service }}" name: "{{ dns_service }}"
state: started state: started
when: not dnsmasq_enabled # See PR #1303, #1306, PR #1318

1
roles/network/templates/network/dnsmasq-iiab Normal file
View file

@ -0,0 +1 @@
bind-interfaces