diff options
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/group_vars/elevate-festival/main.yml | 13 | ||||
| -rw-r--r-- | inventory/host_vars/ele-media.yml | 3 | ||||
| -rw-r--r-- | inventory/host_vars/ele-router.yml | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml index ad203055..80402b03 100644 --- a/inventory/group_vars/elevate-festival/main.yml +++ b/inventory/group_vars/elevate-festival/main.yml @@ -85,15 +85,15 @@ network_zones: ccinet: vlan: 128 - prefix: 85.237.28.224/28 - gw: 85.237.28.225 + prefix: 85.237.2.96/28 + gw: 85.237.2.97 dns: - 217.29.144.65 - 217.29.144.66 offsets: ## citycom uses offset 1,2 and 3 - ele-router: 4 - ele-media: 5 + ele-router: 4 # 85.237.2.100 + ele-media: 5 # 85.237.2.101 ccemc: vlan: 129 @@ -104,6 +104,5 @@ network_zones: - 217.29.144.66 offsets: ## citycom uses offset 1,2 and 3 - helene: 4 - dione: 5 - tethys: 6 + helene: 4 # 85.237.28.196 + dione: 5 # 85.237.28.197 diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index c2c74fb4..b1eb90b6 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -12,7 +12,7 @@ network: mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}" gateway: "{{ network_zones.lan.gw }}" -network_setup: r3-with-lan +network_setup: elevate-festival dyndns: @@ -38,6 +38,7 @@ docker_lvm: size: 20G fs: ext4 +acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" nextcloud_hostnames: - media.elevate.at diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml index 6a3a906e..ca889d82 100644 --- a/inventory/host_vars/ele-router.yml +++ b/inventory/host_vars/ele-router.yml @@ -22,13 +22,13 @@ openwrt_network_external: ## for some reason vlan-id 128 does not work. why?? # ifname: 'eth0.{{ network_wan_zone.vlan }}' ifname: 'eth0.1' - proto: dhcp - # proto: static - # ipaddr: "{{ network_wan_zone.prefix | ipaddr(network_wan_zone.offsets[inventory_hostname]) | ipaddr('address') }}" - # netmask: "{{ network_wan_zone.prefix | ipaddr('netmask') }}" - # gateway: "{{ network_wan_zone.gw }}" - # dns: "{{ network_wan_zone.dns }}" - # accept_ra: 0 +# proto: dhcp + proto: static + ipaddr: "{{ network_wan_zone.prefix | ipaddr(network_wan_zone.offsets[inventory_hostname]) | ipaddr('address') }}" + netmask: "{{ network_wan_zone.prefix | ipaddr('netmask') }}" + gateway: "{{ network_wan_zone.gw }}" + dns: "{{ network_wan_zone.dns }}" + accept_ra: 0 openwrt_network_internal: "{{ openwrt_network_internal_yaml | from_yaml }}" openwrt_network_internal_yaml: | |