Skip to content

N
nextgen-router
Commit 740fabe3 authored by nanahira's avatar nanahira
Browse files
Options

allow undefined things

parent 07ca1340
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
files/bridge-post-scripts/post-up.sh.j2
View file @ 740fabe3
......@@ -3,17 +3,17 @@
source {{ansible_user_dir}}/nextgen-router/scripts/utility.sh
export BRIDGE_NAME={{br.name}}
{% if br.address %}
{% if br.address is defined and br.address %}
export BRIDGE_ADDRESS={{br.address}}
{% endif %}
{% if br.mac %}
{% if br.mac is defined and br.mac %}
# Change mac
export BRIDGE_MAC={{br.mac}}
ip link set "$BRIDGE_NAME" address "$BRIDGE_MAC"
{% endif %}
{% if br.moreAddresses %}
{% if br.moreAddresses is defined and br.moreAddresses %}
# Add more addresses
{% for address in br.moreAddresses %}
ip addr add {{address}} dev {{br.name}}
......@@ -45,30 +45,30 @@ handle_gateway() {
fi
}
{% if br.gateways %}
{% if br.gateways is defined and br.gateways %}
# Gateways
{% for gateway in br.gateways %}
handle_gateway {{gateway.id}} {{gateway.address}} {% if gateway.mac %}{{gateway.mac}}{% else %}"unknown"{% endif %} {% if gateway.noOrigin %}1{% else %}0{% endif %}
handle_gateway {{gateway.id}} {{gateway.address}} {% if gateway.mac is defined and gateway.mac %}{{gateway.mac}}{% else %}"unknown"{% endif %} {% if gateway.noOrigin is defined and gateway.noOrigin %}1{% else %}0{% endif %}
{% endfor %}
{% endif %}
{% if br.masq %}
{% if br.masq is defined and br.masq %}
# Masquerade
iptables -t nat -A POSTROUTING -o "$BRIDGE_NAME" -j MASQUERADE
{% endif %}
{% if br.dhcpv6Client %}
{% if br.dhcpv6Client is defined and br.dhcpv6Client %}
# Restart dhcpv6
cd {{ansible_user_dir}}/nextgen-router/services/dhcpv6
{% for targetbr in bridges %}
{% if targetbr.dhcpv6Receive %}
{% if targetbr.dhcpv6Receive is defined and targetbr.dhcpv6Receive %}
docker-compose up -d --force-recreate dhcpv6-{{br.name}}-{{targetbr.name}}
{% endif %}
{% endfor %}
{% endif %}
{% if br.up %}
{% if br.up is defined and br.up %}
{{br.up}}
{% endif %}
......
files/bridge-post-scripts/pre-down.sh.j2
View file @ 740fabe3
......@@ -3,11 +3,11 @@
source {{ansible_user_dir}}/nextgen-router/scripts/utility.sh
export BRIDGE_NAME={{br.name}}
{% if br.address %}
{% if br.address is defined and br.address %}
export BRIDGE_ADDRESS={{br.address}}
{% endif %}
{% if br.mac %}
{% if br.mac is defined and br.mac %}
# Change mac
export BRIDGE_MAC={{br.mac}}
{% endif %}
......@@ -32,20 +32,20 @@ handle_gateway() {
fi
}
{% if br.gateways %}
{% if br.gateways is defined and br.gateways %}
# Gateways
{% for gateway in br.gateways %}
handle_gateway {{gateway.id}} {{gateway.address}} {% if gateway.mac %}{{gateway.mac}}{% else %}"unknown"{% endif %} {% if gateway.noOrigin %}1{% else %}0{% endif %}
handle_gateway {{gateway.id}} {{gateway.address}} {% if gateway.mac is defined and gateway.mac %}{{gateway.mac}}{% else %}"unknown"{% endif %} {% if gateway.noOrigin is defined and gateway.noOrigin %}1{% else %}0{% endif %}
{% endfor %}
{% endif %}
{% if br.masq %}
{% if br.masq is defined and br.masq %}
# Masquerade
iptables -t nat -D POSTROUTING -o "$BRIDGE_NAME" -j MASQUERADE
{% endif %}
{% if br.down %}
{% if br.down is defined and br.down %}
{{br.down}}
{% endif %}
......
files/dhcpv6/docker-compose.yml.j2
View file @ 740fabe3
version: '2.4'
services:
{% for ppp in ppps %}
{% if ppp.dhcpv6Client %}
{% if ppp.dhcpv6Client is defined and ppp.dhcpv6Client %}
{% for br in bridges %}
{% if br.dhcpv6Receive %}
{% if br.dhcpv6Receive is defined and br.dhcpv6Receive %}
dhcpv6-ppp{{ppp.id}}-{{br.name}}:
image: git-registry.mycard.moe/nanahira/docker-dhcpv6-client
network_mode: host
......@@ -17,9 +17,9 @@ services:
{% endif %}
{% endfor %}
{% for srcbr in bridges %}
{% if srcbr.dhcpv6Client %}
{% if srcbr.dhcpv6Client is defined and srcbr.dhcpv6Client %}
{% for br in bridges %}
{% if br.dhcpv6Receive %}
{% if br.dhcpv6Receive is defined and br.dhcpv6Receive %}
dhcpv6-{{srcbr.name}}-{{br.name}}:
restart: always
image: git-registry.mycard.moe/nanahira/docker-dhcpv6-client
......
files/dnsmasq/dnsmasq.conf.j2
View file @ 740fabe3
......@@ -14,11 +14,11 @@ enable-ra
no-dhcp-interface=lo{% for br in bridges %}{% if not br.dhcp %},{{br.name}}{% endif %}{% endfor %}
{% for br in bridges %}
{% if br.dhcp %}
{% if br.dhcp is defined and br.dhcp %}
dhcp-range={{br.name}},{{br.dhcp.start}},{{br.dhcp.end}},{{br.dhcp.time}}
{% if br.dhcpv6Receive %}
{% if br.dhcpv6Receive is defined and br.dhcpv6Receive %}
dhcp-range=tag:{{br.name}},::,constructor:{{br.name}},ra-names,24h
{% endif %}
......
files/dnsmasq/smartdns.conf.j2
View file @ 740fabe3
......@@ -18,7 +18,7 @@ rr-ttl-max 86400
log-level warn
{% if smartdns.disable_ipv6 %}
{% if smartdns.disable_ipv6 is defined and smartdns.disable_ipv6 %}
force-AAAA-SOA yes
{% else %}
dualstack-ip-selection yes
......
files/interfaces.j2
View file @ 740fabe3
......@@ -58,7 +58,7 @@ iface {{vlan.link}}.{{vlan.tag}} inet6 manual
auto {{br.name}}
allow-hotplug {{br.name}}
iface {{br.name}} inet {{br.type}}
{% if br.links and br.links | length > 0 %}
{% if br.links is defined and br.links and br.links | length > 0 %}
bridge_ports{% for link in br.links %} {{link}}{% endfor %}
{% else %}
......@@ -69,7 +69,7 @@ bridge_maxwait 3
{% if br.type == "static" %}
address {{br.address}}
{% elif br.type == "dhcp" %}
{% if br.gateways and br.gateways | length > 0 %}
{% if br.gateways is defined and br.gateways and br.gateways | length > 0 %}
metric {{ 1100 + br.gateways[0].id }}
{% else %}
metric 9999
......
files/ppp-macvlan-scripts/pre-up.sh.j2
View file @ 740fabe3
#!/bin/bash
ip link add link {{ppp.link}} dev pppm{{ppp.id}} type macvlan
ip link set pppm{{ppp.id}} up
{% if ppp.mac %}
{% if ppp.mac is defined and ppp.mac %}
ip link set pppm{{ppp.id}} address {{ppp.mac}}
{% endif %}
files/ppp-post-scripts/postup.sh.j2
View file @ 740fabe3
......@@ -27,7 +27,7 @@ if [[ "$?" == 0 ]]; then
cd {{ansible_user_dir}}/nextgen-router/services/dhcpv6
{% for br in bridges %}
{% if br.dhcpv6Receive %}
{% if br.dhcpv6Receive is defined and br.dhcpv6Receive %}
docker-compose up -d --force-recreate dhcpv6-$PPP_IFACE-{{br.name}}
{% endif %}
{% endfor %}
......
files/services/docker-compose.yml.j2
View file @ 740fabe3
......@@ -14,11 +14,11 @@ services:
API_KEY: {{instance.apiKey}}
ZONE: {{instance.zone}}
SUBDOMAIN: {{instance.subdomain}}
{% if instance.interface %}
{% if instance.interface is defined and instance.interface %}
INTERFACE: {{instance.interface}}
{% endif %}
DNS_SERVER: 1.0.0.1
{% if instance.ipv6 %}
{% if instance.ipv6 is defined and instance.ipv6 %}
RRTYPE: AAAA
{% else %}
RRTYPE: A
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment