external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-12 19:22:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7 from georgejhunt/resolv

Browse source 
remove anything that breaks if resolvconf service is referenced
This commit is contained in:
georgejhunt 2017-06-05 10:01:52 -07:00 committed by GitHub
commit f194006ab7
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/network/tasks/restart.yml
View file

@ -16,12 +16,6 @@
when: named_enabled when: named_enabled
register: dns_started register: dns_started
# decide if resolvconf will ever be used FIXME
- name: Configure resolvconf -- put localhost in resolv.conf
lineinfile: line="nameserver 127.0.0.1"
dest=/etc/resolvconf/resolv.conf.d/head
when: named_enabled and is_debuntu and dns_started.changed
- name: Stop dansguardian - name: Stop dansguardian
service: name=dansguardian service: name=dansguardian
state=stopped state=stopped

7
roles/network/tasks/rpi_debian.yml
View file

@ -16,12 +16,7 @@
- name: Get the stock resolv.conf manager - name: Get the stock resolv.conf manager
package: name=resolvconf package: name=resolvconf
state=present state=absent
- name: recent raspbian uses dhcpcd rather than resolvconf
service: name=resolvconf
enabled=False
state=stopped
- name: on upgrade from earlier xsce versions, remove /etc/network/interfaces.d/br0 - name: on upgrade from earlier xsce versions, remove /etc/network/interfaces.d/br0
file: path=/etc/network/interfaces.d/br0 file: path=/etc/network/interfaces.d/br0