From 7e2899fc5bb413ae6798a36b73352037080b3d8f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 6 Mar 2020 19:37:57 +0100 Subject: elevate: info-beamer setup for Dom im Berg --- dan/group_vars/elevate-festival.yml | 29 +++++++++++++------------- inventory/group_vars/elevate-festival/main.yml | 21 +++++++++++++++++-- inventory/host_vars/ele-infobeamer-dom.yml | 2 ++ inventory/hosts.ini | 1 + 4 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 inventory/host_vars/ele-infobeamer-dom.yml diff --git a/dan/group_vars/elevate-festival.yml b/dan/group_vars/elevate-festival.yml index c4241b81..31ef6409 100644 --- a/dan/group_vars/elevate-festival.yml +++ b/dan/group_vars/elevate-festival.yml @@ -1,15 +1,16 @@ $ANSIBLE_VAULT;1.2;AES256;dan -31333461663837373335653834656532633963323664636131356161346136613036373564656230 -6163376530653965356435316661613436356134326339660a336538323232353934383538633639 -39633862366462383230623737353230623731346364613666393936303266396438623462323931 -3964363931343761310a346330643630393133323838366439653538663430356439663130306132 -64613330303737356631306638383939343234333436626236366366393866373266336365393438 -30643963356636323934313264613037656537316433333030326664346464323633383332623862 -65636238396364333666313262363630633930633736656333363739613930646433363137643963 -65356537636431333132666230656562626439613033366336323963383730303133333562323837 -37663362633939326661656565613532326230643130323034356163653133656361353663346131 -65623762653233663233383436663838643339616239313030313565613834666538643664386162 -35326161646434623034663237613635656163663437323266306237356337643932633837343764 -30306539643461636462666239643561623363666537303539613362363665393834303934623965 -32353732653666393838343131363034336131626332303539316538343664633635316434393664 -3038323464393432393331303838303935663163613739613137 +39353261626535626239326430356264313131623132393433663561313539613066356235626639 +3565393332373236303636333566323761363330373866300a303765353263366661363066313033 +65633663346366623031323266663139653436343364353331396334353139616364356337323038 +3762373835633830320a363037376330376639643638613637616661376137353337623035646133 +63363062326262393063646163613637663730373966303864376663363662316161663530646535 +65636163363038636637666562346665326466383635336162393532316235613430653762326637 +38373438623064646538623837373364336136623037376339316261396232313337336363363532 +65653838303638336366356532373062373937633534306338653361653936376430363131373130 +66663332346432643264303739376139336133383336323031363662366538633036653564303932 +39353362653864613230386536393135383238373762313330333264626538613938663838626635 +39323261313137303136306265303631633533663330366262633635343530343733383535303135 +66626139666631343438643261653133663631323462373566336464323531633963613032643664 +37346135643930626662656261393331633065396131326633326432633066326333376536353263 +35363030306462376136306166396666663864323037376464623338643230373866623865643233 +653565626631653333346466353138343533 diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml index 8088b82e..14ae8173 100644 --- a/inventory/group_vars/elevate-festival/main.yml +++ b/inventory/group_vars/elevate-festival/main.yml @@ -1,6 +1,7 @@ --- network_zones: lan: + description: "internet and fileserver access for Elevate staff" vlan: 18 prefix: 192.168.18.0/24 gateway: 192.168.18.254 @@ -26,6 +27,7 @@ network_zones: key: "{{ vault_wifi_keys.lan }}" emc: + description: "internet via wireguard tunnel to Hetzner VM, reserved for streams" vlan: 20 prefix: 192.168.20.0/24 gateway: 192.168.20.254 @@ -41,6 +43,7 @@ network_zones: ele-router: 254 guest: + description: "public internet access for all Elevate guests" vlan: 23 prefix: 192.168.23.0/24 gateway: 192.168.23.254 @@ -60,6 +63,7 @@ network_zones: key: "{{ vault_wifi_keys.guest }}" mgmt: + description: "management access to all switches, access points, etc." vlan: 42 prefix: 192.168.42.0/24 offsets: @@ -113,6 +117,7 @@ network_zones: mixer: + description: "video and audio mixer control interfaces" vlan: 48 prefix: 192.168.48.0/24 gateway: 192.168.48.254 @@ -136,6 +141,7 @@ network_zones: ele-router: 254 infoscreens: + description: "internet access for infobeamer" vlan: 73 prefix: 192.168.73.0/24 gateway: 192.168.73.254 @@ -153,10 +159,12 @@ network_zones: key: "{{ vault_wifi_keys.infoscreens }}" cityaccess: + description: "captive portal of citycom public wifi, used for local streamingserver" vlan: 250 prefix: 192.168.250.0/24 ccinet: + description: "citycom upstream for general internet access (Fiber)" vlan: 500 prefix: 85.237.2.96/28 gateway: 85.237.2.97 @@ -169,6 +177,7 @@ network_zones: ele-media: 5 # 85.237.2.101 ccemc: + description: "citycom upstream for streams-only (Fiber)" vlan: 501 prefix: 85.237.28.192/28 gateway: 85.237.28.193 @@ -182,9 +191,17 @@ network_zones: ele-laptop: 7 # 85.237.28.199 forum_a1: + description: "A1 upstream for general internet access (DSL)" vlan: 502 + dom_im_berg: + description: "public wifi at Dom im Berg run by Spielstätten, i.e. used for infobeamer" + wifi: + ssid: Dom + key: "{{ vault_wifi_keys.dom_im_berg }}" + funkfeuer: + description: "funkfeuer access, subnet will be announced using HNA by olsr" vlan: 511 prefix: 10.12.241.128/28 gateway: 10.12.241.142 @@ -198,21 +215,21 @@ network_zones: ele-ups-forum0: 8 ele-ups-forum1: 7 ele-ups-uhrturm0: 6 - nhg: 3 ele-helene: 2 ele-dione: 1 - dns: - 10.12.0.10 murat_transfer: + description: "transfer network for upstream via mur.at" prefix: 172.31.255.0/24 offsets: ele-tub: 1 ele-mur: 254 datacop_lte: + description: "drei Upstream via router by datacop (LTE)" vlan: 512 prefix: 100.64.0.0/24 gateway: 100.64.0.1 diff --git a/inventory/host_vars/ele-infobeamer-dom.yml b/inventory/host_vars/ele-infobeamer-dom.yml new file mode 100644 index 00000000..9ada4b75 --- /dev/null +++ b/inventory/host_vars/ele-infobeamer-dom.yml @@ -0,0 +1,2 @@ +--- +info_beamer_wireless: "{{ network_zones.dom_im_berg.wifi }}" diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 0cad20a1..e431ce43 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -148,6 +148,7 @@ ele-dol-raspi1 [ele-infobeamer] ele-infobeamer-emc ele-infobeamer-orpheum +ele-infobeamer-dom ele-infobeamer-default [elevate:vars] -- cgit v1.2.3