Skip to content

Commit d15f874

Browse files
author
Ritwick DSouza
committed
[raspbian] Improve readability of templates
1 parent 20231fb commit d15f874

8 files changed

Lines changed: 182 additions & 180 deletions

File tree

‎netjsonconfig/backends/raspbian/renderer.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33

44
class RaspbianRenderer(BaseRenderer):
5+
def cleanup(self, output):
6+
output = output.replace(' ', '')
7+
return output
58
pass
69

710

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% for i, j in data.items() %}
2-
{% if i|string() == 'general' %}
3-
{% for general in j %}
4-
{% if general.get('timezone') %}
5-
run commands:
6-
$ timedatectl set-timezone {{ general.get('timezone') }}
2+
{% if i|string() == 'general' %}
3+
{% for general in j %}
4+
{% if general.get('timezone') %}
5+
run commands:
6+
$ timedatectl set-timezone {{ general.get('timezone') }}
77

8-
{% endif %}
9-
{% endfor %}
10-
{% endif %}
8+
{% endif %}
9+
{% endfor %}
10+
{% endif %}
1111
{% endfor%}

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

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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% 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-
{{ general.get('hostname') }}
2+
{% if i|string() == 'general' %}
3+
{% for general in j %}
4+
{% if general.get('hostname') %}
5+
# config: /etc/hostname
6+
{{ general.get('hostname') }}
77

8-
{% endif %}
9-
{% endfor %}
10-
{% endif %}
8+
{% endif %}
9+
{% endfor %}
10+
{% endif %}
1111
{% endfor %}

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

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
{% for i, j in data.items() %}
2-
{% if i|string() == 'interfaces' %}
3-
{% for interface in j %}
4-
{% if interface.get('iftype') == 'wireless' %}
5-
{% if interface.get('mode') == 'adhoc' %}
6-
# config: /etc/network/interfaces
7-
auto {{ interface.get('iftype') }}
8-
iface {{ interface.get('iftype') }} inet static
9-
address 172.128.1.1
10-
netmask 255.255.255.0
11-
wireless-channel 1
12-
wireless-essid {{ interface.get('essid') }}
13-
wireless-mode ad-hoc
14-
{% endif %}
15-
{% elif interface.get('iftype') in ['ethernet', 'bridge', 'loopback'] %}
16-
# config: /etc/network/interfaces
17-
auto {{ interface.get('ifname') }}
18-
{% if interface.get('address') != None %}
19-
{% for address in interface.get('address') %}
20-
{% if address.get('proto') == 'static' %}
21-
{% if address.get('family') == 'ipv4' %}
22-
iface {{ interface.get('ifname') }} inet {{ address.get('proto') }}
23-
address {{ address.get('address') }}
24-
netmask {{ address.get('netmask') }}
25-
{% if address.get('gateway', None) != None %}
26-
gateway {{ address.get('gateway')}}
27-
{% endif %}
28-
{% if interface.get('mtu', None) != None %}
29-
mtu {{ interface.get('mtu') }}
30-
{% endif %}
31-
{% if interface.get('mac', None) != None %}
32-
hwaddress {{ interface.get('mac') }}
33-
{% endif %}
34-
{% if interface.get('iftype') == 'bridge' %}
35-
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
36-
{% endif %}
37-
{% elif address.get('family') == 'ipv6' %}
38-
iface {{ interface.get('ifname') }} inet6 {{ address.get('proto') }}
39-
address {{ address.get('address') }}
40-
netmask {{ address.get('netmask') }}
41-
{% if address.get('gateway', None) != None %}
42-
gateway {{ address.get('ipv6gateway') }}
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('mtu', None) != None %}
58-
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
59-
{% endif %}
60-
{% if interface.get('mac', None) != None %}
61-
hwaddress {{ interface.get('mac') }}
62-
{% endif %}
63-
{% elif address.get('family') == 'ipv6' %}
64-
iface {{ interface.get('ifname') }} inet6 {{ address.get('proto') }}
65-
{% if interface.get('mtu', None) != None %}
66-
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
67-
{% endif %}
68-
{% if interface.get('mac', None) != None %}
69-
hwaddress {{ interface.get('mac') }}
70-
{% endif %}
71-
{% endif %}
72-
{% endif%}
73-
{% endfor %}
74-
{% else %}
75-
{% if interface.get('iftype') == 'bridge' %}
76-
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
77-
{% endif %}
78-
{% endif %}
79-
{% endif %}
2+
{% if i|string() == 'interfaces' %}
3+
{% for interface in j %}
4+
{% if interface.get('iftype') == 'wireless' %}
5+
{% if interface.get('mode') == 'adhoc' %}
6+
# config: /etc/network/interfaces
7+
auto {{ interface.get('iftype') }}
8+
iface {{ interface.get('iftype') }} inet static
9+
address 172.128.1.1
10+
netmask 255.255.255.0
11+
wireless-channel 1
12+
wireless-essid {{ interface.get('essid') }}
13+
wireless-mode ad-hoc
14+
{% endif %}
15+
{% elif interface.get('iftype') in ['ethernet', 'bridge', 'loopback'] %}
16+
# config: /etc/network/interfaces
17+
auto {{ interface.get('ifname') }}
18+
{% if interface.get('address') != None %}
19+
{% for address in interface.get('address') %}
20+
{% if address.get('proto') == 'static' %}
21+
{% if address.get('family') == 'ipv4' %}
22+
iface {{ interface.get('ifname') }} inet {{ address.get('proto') }}
23+
address {{ address.get('address') }}
24+
netmask {{ address.get('netmask') }}
25+
{% if address.get('gateway', None) != None %}
26+
gateway {{ address.get('gateway')}}
27+
{% endif %}
28+
{% if interface.get('mtu', None) != None %}
29+
mtu {{ interface.get('mtu') }}
30+
{% endif %}
31+
{% if interface.get('mac', None) != None %}
32+
hwaddress {{ interface.get('mac') }}
33+
{% endif %}
34+
{% if interface.get('iftype') == 'bridge' %}
35+
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
36+
{% endif %}
37+
{% elif address.get('family') == 'ipv6' %}
38+
iface {{ interface.get('ifname') }} inet6 {{ address.get('proto') }}
39+
address {{ address.get('address') }}
40+
netmask {{ address.get('netmask') }}
41+
{% if address.get('gateway', None) != None %}
42+
gateway {{ address.get('ipv6gateway') }}
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('mtu', None) != None %}
58+
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
59+
{% endif %}
60+
{% if interface.get('mac', None) != None %}
61+
hwaddress {{ interface.get('mac') }}
62+
{% endif %}
63+
{% elif address.get('family') == 'ipv6' %}
64+
iface {{ interface.get('ifname') }} inet6 {{ address.get('proto') }}
65+
{% if interface.get('mtu', None) != None %}
66+
pre-up /sbin/ifconfig $IFACE mtu {{ interface.get('mtu') }}
67+
{% endif %}
68+
{% if interface.get('mac', None) != None %}
69+
hwaddress {{ interface.get('mac') }}
70+
{% endif %}
71+
{% endif %}
72+
{% endif%}
73+
{% endfor %}
74+
{% else %}
75+
{% if interface.get('iftype') == 'bridge' %}
76+
bridge_ports {{ interface.get('bridge_members')[0] }} {{ interface.get('bridge_members')[1] }}
77+
{% endif %}
78+
{% endif %}
79+
{% endif %}
8080

81-
{% endfor %}
82-
{% endif %}
81+
{% endfor %}
82+
{% endif %}
8383
{% endfor%}

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

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

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{% 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-
{% if count.append(count.pop() + 1) %}{% endif %}
7-
{% endif %}
8-
{% endif %}
9-
{% if i|string() == 'dns_servers' %}
10-
{% for ip in j %}
11-
nameserver {{ ip }}
12-
{% endfor %}
13-
{% elif i|string() == 'dns_search' %}
14-
{% for domain in j %}
15-
search {{ domain }}
16-
{% endfor %}
17-
{% endif %}
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+
{% if count.append(count.pop() + 1) %}{% endif %}
7+
{% endif %}
8+
{% endif %}
9+
{% if i|string() == 'dns_servers' %}
10+
{% for ip in j %}
11+
nameserver {{ ip }}
12+
{% endfor %}
13+
{% elif i|string() == 'dns_search' %}
14+
{% for domain in j %}
15+
search {{ domain }}
16+
{% endfor %}
17+
{% endif %}
1818
{% endfor%}

0 commit comments

Comments
 (0)