Compare commits

..

No commits in common. "71b1658ce17f5ee440095b6a69707aa7b74b3e1d" and "9af8e490a3240129089d6711ad21450ac5c60953" have entirely different histories.

3 changed files with 3 additions and 30 deletions

View File

@ -70,12 +70,6 @@
tags:
- networking
- name: ensure interfaces.d directory exists
file:
path: /etc/network/interfaces.d
state: directory
when: wanted_ip4 is defined or wanted_ip6 is defined
- name: configure watchdog
template:
src: watchdog.conf.j2

View File

@ -51,15 +51,6 @@
tags:
- pkg
- name: install bridge (alpine)
apk:
name:
- bridge
state: present
when: bridged_network is defined
tags:
- pkg
- name: install ssmtp (alpine)
apk:
name:

View File

@ -7,31 +7,19 @@ iface lo inet loopback
# The main interface
auto eth0
{% if bridged_network is defined and bridged_network %}
auto br0
iface br0
requires eth0{% if bridged_network != "true" %} {{ bridged_network }}{% endif +%}
bridge-ports eth0{% if bridged_network != "true" %} {{ bridged_network }}{% endif +%}
bridge-fd 0
bridge-stp off
{% else %}
iface eth0
{% endif %}
{% if wanted_ip4 is defined %}
iface eth0 inet static
address {{ wanted_ip4 }}/24
gateway {{ local_network.gateway }}
{% else %}
use dhcp
iface eth0 inet dhcp
{% endif %}
{% if wanted_ip6 is defined %}
iface eth0 inet6 static
{% if local_network.gateway6 is defined %}
address {{ wanted_ip6 }}/64
gateway {{ local_network.gateway6 }}
{% if bridged_network is defined and bridged_network %}
up echo 0 > /proc/sys/net/ipv6/conf/br0/accept_ra
{% else %}
pre-up echo 0 > /proc/sys/net/ipv6/conf/eth0/accept_ra
{% endif %}
{% else %}
address {{ wanted_ip6 }}/128
post-up ip addrlabel add prefix {{ wanted_ip6 }}/64 label 99