diff --git a/roles/alpine/templates/interfaces.j2 b/roles/alpine/templates/interfaces.j2 index 2c883ed..57568cb 100644 --- a/roles/alpine/templates/interfaces.j2 +++ b/roles/alpine/templates/interfaces.j2 @@ -4,21 +4,15 @@ iface lo inet loopback {% for iface in interfaces | selectattr('enabled') %} auto {{ iface.name }} iface {{ iface.name }} inet static -{% for address in iface.ip_addresses %} - address {{ address.address }} -{% if address.family.value == 4 %} -{% set subnet = address.address | ipaddr('subnet') %} +{% for ip in iface.ip_addresses %} + address {{ ip.address }} +{% set subnet = ip.address | ipaddr('subnet') %} {% set prefix = prefixes | selectattr('prefix', '==', subnet) | first %} {% set gateway = prefix.custom_fields.gateway.address %} -{% if gateway is defined and gateway != address.address %} +{% if gateway is defined and gateway != ip.address %} gateway {{ gateway | ipaddr('address') }} {% endif %} -{% endif %} -{% endfor -%} - -{# disable SLAAC if we have a manually set IPv6 address #} -{% if iface.ip_addresses | selectattr("family.value", "==", 6) %} +{% endfor %} pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf -{% endif %} {% endfor %} diff --git a/roles/dokuwiki/files/userstyle.css b/roles/dokuwiki/files/userstyle.css index b2d7071..45b72cb 100644 --- a/roles/dokuwiki/files/userstyle.css +++ b/roles/dokuwiki/files/userstyle.css @@ -18,8 +18,8 @@ body { .page p, .page ol, .page ul { text-align: justify; - line-height: 1.4em; - margin: 0 0 0.75em; + line-height: 1.6em; + margin: 0 0 0.5em; } .page code {