Skip to content

Commit 1af682e

Browse files
author
Ritwick DSouza
committed
[raspbian] Improved readability of templates
1 parent 7c5f62a commit 1af682e

File tree

3 files changed

+101
-103
lines changed

3 files changed

+101
-103
lines changed

‎netjsonconfig/backends/raspbian/templates/hostapd.jinja2‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{% for wireless in data.wireless %}
22
# config: /etc/hostapd/hostapd.conf
33

4-
interface={{ wireless.get('ifname') }}
4+
interface={{ wireless.ifname }}
55
driver=nl80211
6-
{% if wireless.get('protocol') == 'a' or 'b' or 'g' %}
7-
hw_mode={{ wireless.get('hwmode')}}
6+
{% if wireless.protocol == 'a' or 'b' or 'g' %}
7+
hw_mode={{ wireless.hwmode }}
88
{% endif %}
9-
channel={{ wireless.get('channel')}}
10-
{% if wireless.get('protocol') == '80211n' %}
9+
channel={{ wireless.channel }}
10+
{% if wireless.protocol == '80211n' %}
1111
ieee80211n=1
1212
{% endif %}
13-
{% if wireless.get('protocol') == '80211ac' %}
13+
{% if wireless.protocol == '80211ac' %}
1414
ieee80211ac=1
1515
{% endif %}
16-
ssid={{ wireless.get('ssid') }}
17-
{% if wireless.get('encryption') != {} %}
18-
auth_algs={{ wireless.get('encryption').get('auth_algs') }}
19-
wpa={{ wireless.get('encryption').get('wpa') }}
20-
wpa_key_mgmt={{ wireless.get('encryption').get('wpa_key_mgmt') }}
21-
wpa_passphrase={{ wireless.get('encryption').get('wpa_passphrase') }}
22-
{% if wireless.get('encryption', None).get('wpa_pairwise') != 'AUTO' %}
23-
wpa_pairwise={{ wireless.get('encryption').get('wpa_pairwise')}}
16+
ssid={{ wireless.ssid }}
17+
{% if wireless.encryption %}
18+
auth_algs={{ wireless.encryption.auth_algs }}
19+
wpa={{ wireless.encryption.wpa }}
20+
wpa_key_mgmt={{ wireless.encryption.wpa_key_mgmt }}
21+
wpa_passphrase={{ wireless.encryption.wpa_passphrase }}
22+
{% if wireless.encryption.wpa_pairwise != 'AUTO' %}
23+
wpa_pairwise={{ wireless.encryption.wpa_pairwise }}
2424
{% endif %}
2525
{% endif %}
2626
{% endfor %}

‎netjsonconfig/backends/raspbian/templates/hostname.jinja2‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
{% for general in data.general %}
2-
{% if general.get('hostname') %}
3-
# config: /etc/hostname
1+
{% if data.general and data.general[0].hostname %}
2+
# config: /etc/hostname
43

5-
{{ general.get('hostname') }}
6-
7-
{% endif %}
8-
{% endfor %}
4+
{{ data.general[0].hostname }}
5+
6+
{% endif %}

‎netjsonconfig/backends/raspbian/templates/interfaces.jinja2‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -3,106 +3,106 @@
33

44
{% endif%}
55
{% for interface in data.interfaces %}
6-
{% if interface.get('iftype') in ['ethernet', 'bridge', 'loopback', 'wireless'] %}
7-
{% if interface.get('address') != None %}
8-
auto {{ interface.get('ifname') }}
9-
{% for address in interface.get('address') %}
10-
{% if address.get('proto') == 'static' %}
11-
{% if address.get('family') == 'ipv4' %}
12-
iface {{ interface.get('ifname') }} inet {{ address.get('proto') }}
13-
address {{ address.get('address') }}
14-
netmask {{ address.get('netmask') }}
15-
{% if address.get('gateway', None) != None %}
16-
gateway {{ address.get('gateway')}}
17-
{% endif %}
18-
{% if interface.get('route') != None %}
19-
{% set route = interface.get('route')%}
20-
post-up route add -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
21-
pre-up route del -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
22-
{% endif %}
23-
{% if interface.get('mtu', None) != None %}
24-
mtu {{ interface.get('mtu') }}
25-
{% endif %}
26-
{% if interface.get('mac', None) != None %}
27-
hwaddress {{ interface.get('mac') }}
28-
{% endif %}
29-
{% if interface.get('iftype') == 'bridge' %}
30-
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
31-
{% endif %}
32-
{% elif address.get('family') == 'ipv6' %}
33-
iface {{ interface.get('ifname') }} inet6 {{ address.get('proto') }}
34-
address {{ address.get('address') }}
35-
netmask {{ address.get('netmask') }}
36-
{% if address.get('gateway', None) != None %}
37-
gateway {{ address.get('gateway') }}
38-
{% endif %}
39-
{% if interface.get('route') != None %}
40-
{% set route = interface.get('route')%}
41-
up ip -6 route add {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
42-
down ip -6 route del {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
43-
{% endif %}
44-
{% if interface.get('mtu', None) != None %}
45-
mtu {{ interface.get('mtu') }}
46-
{% endif %}
47-
{% if interface.get('mac', None) != None %}
48-
hwaddress {{ interface.get('mac') }}
49-
{% endif %}
50-
{% if interface.get('iftype') == 'bridge' %}
51-
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
6+
{% if interface.iftype in ['ethernet', 'bridge', 'loopback', 'wireless'] %}
7+
{% if interface.address %}
8+
auto {{ interface.ifname }}
9+
{% for address in interface.address %}
10+
{% if address.proto == 'static' %}
11+
{% if address.family == 'ipv4' %}
12+
iface {{ interface.ifname }} inet {{ address.proto }}
13+
address {{ address.address }}
14+
netmask {{ address.netmask }}
15+
{% if address.gateway %}
16+
gateway {{ address.gateway }}
17+
{% endif %}
18+
{% if interface.route %}
19+
{% set route = interface.route %}
20+
post-up route add -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
21+
pre-up route del -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
22+
{% endif %}
23+
{% if interface.mtu %}
24+
mtu {{ interface.mtu }}
25+
{% endif %}
26+
{% if interface.mac %}
27+
hwaddress {{ interface.mac }}
28+
{% endif %}
29+
{% if interface.iftype == 'bridge' %}
30+
bridge_ports {{ interface.bridge_members[0] }} {{ interface.bridge_members[1] }}
31+
{% endif %}
32+
{% elif address.family == 'ipv6' %}
33+
iface {{ interface.ifname }} inet6 {{ address.proto }}
34+
address {{ address.address }}
35+
netmask {{ address.netmask }}
36+
{% if address.gateway %}
37+
gateway {{ address.gateway }}
38+
{% endif %}
39+
{% if interface.route %}
40+
{% set route = interface.route %}
41+
up ip -6 route add {{ route.destination }} via {{ route.next }} dev eth0
42+
down ip -6 route del {{ route.destination }} via {{ route.next }} dev eth0
43+
{% endif %}
44+
{% if interface.mtu %}
45+
mtu {{ interface.mtu }}
46+
{% endif %}
47+
{% if interface.mac %}
48+
hwaddress {{ interface.mac }}
49+
{% endif %}
50+
{% if interface.iftype == 'bridge' %}
51+
bridge_ports {{ interface.bridge_members[0] }} {{ interface.bridge_members[1] }}
5252
{% endif %}
5353
{% endif %}
54-
{% elif address.get('proto') == 'dhcp' %}
55-
{% if address.get('family') == 'ipv4'%}
56-
iface {{ interface.get('ifname') }} inet {{ address.get('proto') }}
57-
{% if interface.get('route') != None %}
58-
{% set route = interface.get('route')%}
59-
post-up route add -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
60-
pre-up route del -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
54+
{% elif address.proto == 'dhcp' %}
55+
{% if address.family == 'ipv4'%}
56+
iface {{ interface.ifname }} inet {{ address.proto }}
57+
{% if interface.route %}
58+
{% set route = interface.route %}
59+
post-up route add -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
60+
pre-up route del -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
6161
{% endif %}
62-
{% if interface.get('mtu', None) != None %}
63-
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
62+
{% if interface.mtu %}
63+
pre-up /sbin/ifconfig $IFACE mtu {{ interface.mtu }}
6464
{% endif %}
65-
{% if interface.get('mac', None) != None %}
66-
hwaddress {{ interface.get('mac') }}
65+
{% if interface.mac %}
66+
hwaddress {{ interface.mac }}
6767
{% endif %}
68-
{% elif address.get('family') == 'ipv6' %}
69-
iface {{ interface.get('ifname') }} inet6 {{ address.get('proto') }}
70-
{% if interface.get('route') != None %}
71-
{% set route = interface.get('route') %}
72-
up ip -6 route add {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
73-
down ip -6 route del {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
68+
{% elif address.family == 'ipv6' %}
69+
iface {{ interface.ifname }} inet6 {{ address.proto }}
70+
{% if interface.route %}
71+
{% set route = interface.route %}
72+
up ip -6 route add {{ route.destination }} via {{ route.next }} dev eth0
73+
down ip -6 route del {{ route.destination }} via {{ route.next }} dev eth0
7474
{% endif %}
75-
{% if interface.get('mtu', None) != None %}
76-
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
75+
{% if interface.mtu %}
76+
pre-up /sbin/ifconfig $IFACE mtu {{ interface.mtu }}
7777
{% endif %}
78-
{% if interface.get('mac', None) != None %}
79-
hwaddress {{ interface.get('mac') }}
78+
{% if interface.mac %}
79+
hwaddress {{ interface.mac }}
8080
{% endif %}
8181
{% endif %}
8282
{% endif%}
8383
{% endfor %}
8484
{% else %}
85-
auto {{ interface.get('ifname') }}
86-
{% if interface.get('iftype') in ['ethernet', 'wireless'] and interface.get('mode') != 'adhoc' %}
87-
iface {{ interface.get('ifname') }} inet manual
88-
{% set route = interface.get('route')%}
89-
{% if interface.get('route') != None and route.get('version') == 4 %}
90-
post-up route add -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
91-
pre-up route del -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
92-
{% elif interface.get('route') != None and route.get('version') == 6 %}
93-
up ip -6 route add {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
94-
down ip -6 route del {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
85+
auto {{ interface.ifname }}
86+
{% if interface.iftype in ['ethernet', 'wireless'] and interface.mode != 'adhoc' %}
87+
iface {{ interface.ifname }} inet manual
88+
{% set route = interface.route %}
89+
{% if interface.route and route.version == 4 %}
90+
post-up route add -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
91+
pre-up route del -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
92+
{% elif interface.route and route.version == 6 %}
93+
up ip -6 route add {{ route.destination }} via {{ route.next }} dev eth0
94+
down ip -6 route del {{ route.destination }} via {{ route.next }} dev eth0
9595
{% endif %}
9696
{% endif %}
97-
{% if interface.get('iftype') == 'bridge' %}
98-
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
97+
{% if interface.iftype == 'bridge' %}
98+
bridge_ports {{ interface.bridge_members[0] }} {{ interface.bridge_members[1] }}
9999
{% endif %}
100-
{% if interface.get('mode') == 'adhoc' %}
101-
iface {{ interface.get('ifname') }} inet static
100+
{% if interface.mode == 'adhoc' %}
101+
iface {{ interface.ifname }} inet static
102102
address 172.128.1.1
103103
netmask 255.255.255.0
104104
wireless-channel 1
105-
wireless-essid {{ interface.get('essid') }}
105+
wireless-essid {{ interface.essid }}
106106
wireless-mode ad-hoc
107107
{% endif %}
108108
{% endif %}

0 commit comments

Comments
 (0)