Skip to content

Commit 4d84152

Browse files
author
Ritwick DSouza
committed
[raspbian] Simplifed jinja2 templates
1 parent aa88e6c commit 4d84152

5 files changed

Lines changed: 150 additions & 173 deletions

File tree

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

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
1-
{% for i, j in data.items() %}
2-
{% if i|string() == 'wireless' %}
3-
{% for wireless in j %}
4-
# config: /etc/hostapd/hostapd.conf
5-
6-
interface={{ wireless.get('ifname') }}
7-
driver=nl80211
8-
{% if wireless.get('protocol') == 'a' or 'b' or 'g' %}
9-
hw_mode={{ wireless.get('hwmode')}}
10-
{% endif %}
11-
channel={{ wireless.get('channel')}}
12-
{% if wireless.get('protocol') == '80211n' %}
13-
ieee80211n=1
14-
{% endif %}
15-
{% if wireless.get('protocol') == '80211ac' %}
16-
ieee80211ac=1
17-
{% endif %}
18-
ssid={{ wireless.get('ssid') }}
19-
{% if wireless.get('encryption') != {} %}
20-
auth_algs={{ wireless.get('encryption').get('auth_algs') }}
21-
wpa={{ wireless.get('encryption').get('wpa') }}
22-
wpa_key_mgmt={{ wireless.get('encryption').get('wpa_key_mgmt') }}
23-
wpa_passphrase={{ wireless.get('encryption').get('wpa_passphrase') }}
24-
{% if wireless.get('encryption', None).get('wpa_pairwise') != 'AUTO' %}
25-
wpa_pairwise={{ wireless.get('encryption').get('wpa_pairwise')}}
26-
{% endif %}
27-
{% endif %}
28-
{% endfor %}
1+
{% for wireless in data.wireless %}
2+
# config: /etc/hostapd/hostapd.conf
3+
4+
interface={{ wireless.get('ifname') }}
5+
driver=nl80211
6+
{% if wireless.get('protocol') == 'a' or 'b' or 'g' %}
7+
hw_mode={{ wireless.get('hwmode')}}
8+
{% endif %}
9+
channel={{ wireless.get('channel')}}
10+
{% if wireless.get('protocol') == '80211n' %}
11+
ieee80211n=1
12+
{% endif %}
13+
{% if wireless.get('protocol') == '80211ac' %}
14+
ieee80211ac=1
15+
{% 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')}}
24+
{% endif %}
2925
{% endif %}
3026
{% endfor %}

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
{% for i, j in data.items() %}
2-
{% if i|string() == 'general' %}
3-
{% for general in j %}
4-
{% if general.get('hostname') %}
5-
# config: /etc/hostname
6-
7-
{{ general.get('hostname') }}
1+
{% for general in data.general %}
2+
{% if general.get('hostname') %}
3+
# config: /etc/hostname
4+
5+
{{ general.get('hostname') }}
86

9-
{% endif %}
10-
{% endfor %}
117
{% endif %}
128
{% endfor %}

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

Lines changed: 105 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,110 @@
1-
{% for i, j in data.items() %}
2-
{% if i|string() == 'interfaces' %}
3-
{% for interface in j %}
4-
{% if interface.get('iftype') in ['ethernet', 'bridge', 'loopback', 'wireless'] %}
5-
# config: /etc/network/interfaces
6-
{% if interface.get('address') != None %}
1+
{% for interface in data.interfaces %}
2+
{% if interface.get('iftype') in ['ethernet', 'bridge', 'loopback', 'wireless'] %}
3+
# config: /etc/network/interfaces
4+
{% if interface.get('address') != None %}
75

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] }}
52-
{% endif %}
53-
{% 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') }}
61-
{% endif %}
62-
{% if interface.get('mtu', None) != None %}
63-
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
64-
{% endif %}
65-
{% if interface.get('mac', None) != None %}
66-
hwaddress {{ interface.get('mac') }}
67-
{% 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
74-
{% endif %}
75-
{% if interface.get('mtu', None) != None %}
76-
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
77-
{% endif %}
78-
{% if interface.get('mac', None) != None %}
79-
hwaddress {{ interface.get('mac') }}
80-
{% endif %}
81-
{% endif %}
82-
{% endif%}
83-
{% endfor %}
84-
{% else %}
85-
86-
auto {{ interface.get('ifname') }}
87-
{% if interface.get('iftype') in ['ethernet', 'wireless'] and interface.get('mode') != 'adhoc' %}
88-
iface {{ interface.get('ifname') }} inet manual
89-
{% set route = interface.get('route')%}
90-
{% if interface.get('route') != None and route.get('version') == 4 %}
91-
post-up route add -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
92-
pre-up route del -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
93-
{% elif interface.get('route') != None and route.get('version') == 6 %}
94-
up ip -6 route add {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
95-
down ip -6 route del {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
96-
{% endif %}
97-
{% endif %}
98-
{% if interface.get('iftype') == 'bridge' %}
99-
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
6+
auto {{ interface.get('ifname') }}
7+
{% for address in interface.get('address') %}
8+
{% if address.get('proto') == 'static' %}
9+
{% if address.get('family') == 'ipv4' %}
10+
iface {{ interface.get('ifname') }} inet {{ address.get('proto') }}
11+
address {{ address.get('address') }}
12+
netmask {{ address.get('netmask') }}
13+
{% if address.get('gateway', None) != None %}
14+
gateway {{ address.get('gateway')}}
15+
{% endif %}
16+
{% if interface.get('route') != None %}
17+
{% set route = interface.get('route')%}
18+
post-up route add -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
19+
pre-up route del -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
20+
{% endif %}
21+
{% if interface.get('mtu', None) != None %}
22+
mtu {{ interface.get('mtu') }}
23+
{% endif %}
24+
{% if interface.get('mac', None) != None %}
25+
hwaddress {{ interface.get('mac') }}
26+
{% endif %}
27+
{% if interface.get('iftype') == 'bridge' %}
28+
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
29+
{% endif %}
30+
{% elif address.get('family') == 'ipv6' %}
31+
iface {{ interface.get('ifname') }} inet6 {{ address.get('proto') }}
32+
address {{ address.get('address') }}
33+
netmask {{ address.get('netmask') }}
34+
{% if address.get('gateway', None) != None %}
35+
gateway {{ address.get('gateway') }}
36+
{% endif %}
37+
{% if interface.get('route') != None %}
38+
{% set route = interface.get('route')%}
39+
up ip -6 route add {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
40+
down ip -6 route del {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
41+
{% endif %}
42+
{% if interface.get('mtu', None) != None %}
43+
mtu {{ interface.get('mtu') }}
44+
{% endif %}
45+
{% if interface.get('mac', None) != None %}
46+
hwaddress {{ interface.get('mac') }}
47+
{% endif %}
48+
{% if interface.get('iftype') == 'bridge' %}
49+
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
50+
{% endif %}
10051
{% endif %}
101-
{% if interface.get('mode') == 'adhoc' %}
102-
iface {{ interface.get('ifname') }} inet static
103-
address 172.128.1.1
104-
netmask 255.255.255.0
105-
wireless-channel 1
106-
wireless-essid {{ interface.get('essid') }}
107-
wireless-mode ad-hoc
52+
{% elif address.get('proto') == 'dhcp' %}
53+
{% if address.get('family') == 'ipv4'%}
54+
iface {{ interface.get('ifname') }} inet {{ address.get('proto') }}
55+
{% if interface.get('route') != None %}
56+
{% set route = interface.get('route')%}
57+
post-up route add -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
58+
pre-up route del -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
59+
{% endif %}
60+
{% if interface.get('mtu', None) != None %}
61+
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
62+
{% endif %}
63+
{% if interface.get('mac', None) != None %}
64+
hwaddress {{ interface.get('mac') }}
65+
{% endif %}
66+
{% elif address.get('family') == 'ipv6' %}
67+
iface {{ interface.get('ifname') }} inet6 {{ address.get('proto') }}
68+
{% if interface.get('route') != None %}
69+
{% set route = interface.get('route') %}
70+
up ip -6 route add {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
71+
down ip -6 route del {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
72+
{% endif %}
73+
{% if interface.get('mtu', None) != None %}
74+
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
75+
{% endif %}
76+
{% if interface.get('mac', None) != None %}
77+
hwaddress {{ interface.get('mac') }}
78+
{% endif %}
10879
{% endif %}
109-
{% endif %}
110-
{% endif %}
80+
{% endif%}
81+
{% endfor %}
82+
{% else %}
11183

112-
{% endfor %}
84+
auto {{ interface.get('ifname') }}
85+
{% if interface.get('iftype') in ['ethernet', 'wireless'] and interface.get('mode') != 'adhoc' %}
86+
iface {{ interface.get('ifname') }} inet manual
87+
{% set route = interface.get('route')%}
88+
{% if interface.get('route') != None and route.get('version') == 4 %}
89+
post-up route add -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
90+
pre-up route del -net {{ route.get('dest') }} netmask {{ route.get('dest_mask') }} gw {{ route.get('next') }}
91+
{% elif interface.get('route') != None and route.get('version') == 6 %}
92+
up ip -6 route add {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
93+
down ip -6 route del {{ route.get('destination') }} via {{ route.get('next')}} dev eth0
94+
{% endif %}
95+
{% endif %}
96+
{% if interface.get('iftype') == 'bridge' %}
97+
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
98+
{% endif %}
99+
{% if interface.get('mode') == 'adhoc' %}
100+
iface {{ interface.get('ifname') }} inet static
101+
address 172.128.1.1
102+
netmask 255.255.255.0
103+
wireless-channel 1
104+
wireless-essid {{ interface.get('essid') }}
105+
wireless-mode ad-hoc
106+
{% endif %}
107+
{% endif %}
113108
{% endif %}
114-
{% endfor%}
109+
110+
{% endfor %}

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
{% for i, j in data.items() %}
2-
{% if i|string() == 'ntp' %}
3-
# config: /etc/ntp.conf
4-
5-
{% for server in j %}
6-
server {{ server }}
7-
{% endfor %}
8-
{% endif %}
1+
{% if data.ntp %}
2+
# config: /etc/ntp.conf
3+
4+
{% endif %}
5+
{% for ntp in data.ntp %}
6+
server {{ ntp }}
97
{% endfor %}

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

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
{% set count = [1] %}
2-
{% for i, j in data.items() %}
3-
{% if i|string() in ['dns_servers', 'dns_search'] %}
4-
{% if count == [1] %}
5-
# config: /etc/resolv.conf
6-
7-
{% if count.append(count.pop() + 1) %}{% endif %}
8-
{% endif %}
9-
{% endif %}
10-
{% if i|string() == 'dns_servers' %}
11-
{% for ip in j %}
12-
nameserver {{ ip }}
13-
{% endfor %}
14-
{% elif i|string() == 'dns_search' %}
15-
{% for domain in j %}
16-
search {{ domain }}
17-
{% endfor %}
18-
{% endif %}
19-
{% endfor%}
1+
{% if data.dns_servers or data.dns_search %}
2+
# config: /etc/resolv.conf
3+
4+
{% endif %}
5+
{% for ip in data.dns_servers %}
6+
nameserver {{ ip }}
7+
{% endfor %}
8+
{% for domain in data.dns_search %}
9+
search {{ domain }}
10+
{% endfor %}

0 commit comments

Comments
 (0)