external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

get lan_ip soft coded everywhere

Browse source
This commit is contained in:
George Hunt 2022-06-23 04:55:56 +01:00
parent 3c04ba6fb0
commit 41a91bd0f5
10 changed files with 49 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

17
roles/network/templates/dhcp/dhcpd-iiab.conf.j2
View file

@ -5,15 +5,22 @@ ddns-update-style interim;
#ignore client-updates;
option domain-name "{{ iiab_domain }}";
option domain-name-servers 172.18.96.1;
option ntp-servers 172.18.96.1;
option domain-name-servers {{ lan_ip }};
option ntp-servers {{ lan_ip }};
subnet 172.18.96.0 netmask 255.255.224.0 {
{% if iiab_network_mode == "Gateway" %}
option routers 172.18.96.1;
option routers {{ lan_ip }};
{% endif %}
option subnet-mask 255.255.224.0;
option broadcast-address 172.18.127.255;
{% if 172_network %}
option subnet-mask 255.255.224.0;
option broadcast-address 172.18.127.255;
{% else %}
option subnet-mask 255.255.255.0;
option broadcast-address 10.10.10.255;
{% endif %}
# Description of network allocations in old OLPC school server
# this is the whole range we have available - 8K addresses
# range 172.18.96.2 172.18.127.254;
# instead, we'll save 510 addresses for later.

2
roles/network/templates/gateway/iiab-gen-iptables
View file

@ -64,7 +64,7 @@ echo "iiab_gateway_enabled: $iiab_gateway_enabled"
echo
#network_mode=`grep iiab_network_mode_applied /etc/iiab/iiab.ini | gawk '{print $3}'`
#echo -e "Network Mode: $network_mode\n"
lan_ip=$(iiab_var_value lan_ip) # 172.18.96.1
lan_ip=$(iiab_var_value lan_ip) # {{ lan_ip }}
ports_externally_visible=$(iiab_var_value ports_externally_visible)
gw_block_https=$(iiab_var_value gw_block_https)

22
roles/network/templates/named/school.internal.zone.db
View file

@ -1,19 +1,19 @@
@ in soa localhost. root 1 3H 15M 1W 1D
ns localhost.
{{ iiab_hostname }} IN A 172.18.96.1
schoolserver IN A 172.18.96.1
school IN A 172.18.96.1
www IN A 172.18.96.1
ntp IN A 172.18.96.1
time IN A 172.18.96.1
presence IN A 172.18.96.1
xs IN A 172.18.96.1
library IN A 172.18.96.1
box IN A 172.18.96.1
{{ iiab_hostname }} IN A {{ lan_ip }}
schoolserver IN A {{ lan_ip }}
school IN A {{ lan_ip }}
www IN A {{ lan_ip }}
ntp IN A {{ lan_ip }}
time IN A {{ lan_ip }}
presence IN A {{ lan_ip }}
xs IN A {{ lan_ip }}
library IN A {{ lan_ip }}
box IN A {{ lan_ip }}
conference.schoolserver IN A 172.18.96.1
conference.schoolserver IN A {{ lan_ip }}
; translations of school - in plain latin script

22
roles/network/templates/named/school.local.zone.db
View file

@ -3,18 +3,18 @@
@ in soa localhost. root 1 3H 15M 1W 1D
ns localhost.
{{ iiab_hostname }} IN A 172.18.96.1
schoolserver IN A 172.18.96.1
school IN A 172.18.96.1
www IN A 172.18.96.1
ntp IN A 172.18.96.1
time IN A 172.18.96.1
presence IN A 172.18.96.1
xs IN A 172.18.96.1
library IN A 172.18.96.1
box IN A 172.18.96.1
{{ iiab_hostname }} IN A {{ lan_ip }}
schoolserver IN A {{ lan_ip }}
school IN A {{ lan_ip }}
www IN A {{ lan_ip }}
ntp IN A {{ lan_ip }}
time IN A {{ lan_ip }}
presence IN A {{ lan_ip }}
xs IN A {{ lan_ip }}
library IN A {{ lan_ip }}
box IN A {{ lan_ip }}
conference.schoolserver IN A 172.18.96.1
conference.schoolserver IN A {{ lan_ip }}
; translations of school - in plain latin script