diff options
Diffstat (limited to 'roles/space_server')
| -rw-r--r-- | roles/space_server/tasks/nftables.yml | 4 | ||||
| -rw-r--r-- | roles/space_server/templates/nftables.conf.j2 (renamed from roles/space_server/files/nftables.conf) | 8 | ||||
| -rw-r--r-- | roles/space_server/templates/radius/clients.conf.j2 | 4 | ||||
| -rw-r--r-- | roles/space_server/templates/s.zone.j2 | 4 | ||||
| -rw-r--r-- | roles/space_server/vars/main.yml | 2 |
5 files changed, 12 insertions, 10 deletions
diff --git a/roles/space_server/tasks/nftables.yml b/roles/space_server/tasks/nftables.yml index 9c56714..df1ec85 100644 --- a/roles/space_server/tasks/nftables.yml +++ b/roles/space_server/tasks/nftables.yml @@ -8,9 +8,9 @@ mode: 0644 - name: Configure nftables - copy: + template: dest: '/etc/nftables.conf' - src: nftables.conf + src: nftables.conf.j2 owner: root group: root mode: 0644 diff --git a/roles/space_server/files/nftables.conf b/roles/space_server/templates/nftables.conf.j2 index 93ecc25..412270c 100644 --- a/roles/space_server/files/nftables.conf +++ b/roles/space_server/templates/nftables.conf.j2 @@ -1,9 +1,9 @@ # our hosts -define ap1 = 10.42.0.5 -define ap2 = 10.42.0.6 +define ap1 = {{ local_hosts['ap1'].ipv4[0] }} +define ap2 = {{ local_hosts['ap2'].ipv4[0] }} define labitat = 185.38.172.72 -define jumbotron_ip4 = 10.42.1.36 -define jumbotron_ip6 = 2a01:4262:1ab:b:ba27:ebff:fed3:c162 +define jumbotron_ip4 = {{ local_hosts['jumbotron'].ipv4[0] }} +define jumbotron_ip6 = {{ local_hosts['jumbotron'].ipv6[0] }} # internal stuff define ext_if = wan diff --git a/roles/space_server/templates/radius/clients.conf.j2 b/roles/space_server/templates/radius/clients.conf.j2 index 0e82666..805e419 100644 --- a/roles/space_server/templates/radius/clients.conf.j2 +++ b/roles/space_server/templates/radius/clients.conf.j2 @@ -1,12 +1,12 @@ client ap1 { - ipaddr = 10.42.0.5 + ipaddr = {{ local_hosts['ap1'].ipv4[0] }} netmask = 32 secret = {{ radius_passwords.ap1 }} nas_type = other } client ap2 { - ipaddr = 10.42.0.6 + ipaddr = {{ local_hosts['ap2'].ipv4[0] }} netmask = 32 secret = {{ radius_passwords.ap2 }} nas_type = other diff --git a/roles/space_server/templates/s.zone.j2 b/roles/space_server/templates/s.zone.j2 index 0394e98..6fee322 100644 --- a/roles/space_server/templates/s.zone.j2 +++ b/roles/space_server/templates/s.zone.j2 @@ -1,8 +1,8 @@ s. 600 IN SOA space.labitat.dk. esmil.labitat.dk. 2019040101 7200 3600 604800 86400 s. 600 IN NS space.labitat.dk. -s. 600 IN A 10.42.1.1 -s. 600 IN AAAA 2a01:4260:1ab:: +s. 600 IN A {{ local_hosts['space'].ipv4[0] }} +s. 600 IN AAAA {{ local_hosts['space'].ipv6[0] }} labitrack.s. 600 IN A 185.38.175.70 labitrack.s. 600 IN AAAA 2a01:4262:1ab::cafe diff --git a/roles/space_server/vars/main.yml b/roles/space_server/vars/main.yml index 93fca5f..e942984 100644 --- a/roles/space_server/vars/main.yml +++ b/roles/space_server/vars/main.yml @@ -166,6 +166,8 @@ local_hosts: mac: b8:27:eb:d3:c1:62 ipv4: - 10.42.1.36 + ipv6: + - 2a01:4262:1ab:b:ba27:ebff:fed3:c162 hplaserjet: mac: 94:57:a5:ce:e2:6c mdns: false |