external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1903 from holta/patch_auto

Browse source 
Revert #1886, test for Debian 9+
This commit is contained in:
A Holt 2019-07-26 12:26:32 -04:00 • committed by GitHub
commit 0a17250a4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/network/tasks/debian.yml
View file

@ -49,18 +49,18 @@
src: network/rpi.j2 src: network/rpi.j2
when: is_rpi and iiab_lan_iface == "br0" when: is_rpi and iiab_lan_iface == "br0"
- name: Workaround auto issue - ifupdown compatibility mode (debian-9) - name: Workaround auto issue - ifupdown compatibility mode (debian-9+)
template: template:
dest: /etc/network/interfaces.d/patch_auto dest: /etc/network/interfaces.d/patch_auto
src: network/debian-auto.j2 src: network/debian-auto.j2
when: iiab_wan_iface != "none" and is_debian_9 when: iiab_wan_iface != "none" and is_debian and not is_debian_8
- name: Clearing out /etc/network/interfaces for static addresses (debian-9) - name: Clearing out /etc/network/interfaces for static addresses (debian-9+)
lineinfile: lineinfile:
state: absent state: absent
path: /etc/network/interfaces path: /etc/network/interfaces
regexp: "{{ iiab_wan_iface }}" regexp: "{{ iiab_wan_iface }}"
when: wan_ip != "dhcp" and iiab_wan_iface != "none" and is_debian_9 when: wan_ip != "dhcp" and iiab_wan_iface != "none" and is_debian and not is_debian_8
- name: BIND may be affected - name: BIND may be affected
service: service:

2
roles/network/templates/network/debian-auto.j2
View file

@ -1 +1,3 @@
# Supplied by iiab-install or iiab-network (in /opt/iiab/iiab)
auto {{ iiab_wan_iface }} auto {{ iiab_wan_iface }}