elevate accesspoints work now

3 files changed, 147 insertions, 136 deletions

diff --git a/inventory/group_vars/accesspoints/main.yml b/inventory/group_vars/accesspoints/main.yml
new file mode 100644
index 00000000..c85f05f5
--- /dev/null
+++ b/inventory/group_vars/accesspoints/main.yml
@@ -0,0 +1,129 @@
+---
+accesspoint_wired_interface: eth0
+accesspoint_wireless_device_paths:
+  2g4: "platform/qca956x_wmac"
+  5g: "pci0000:00/0000:00:00.0"
+
+accesspoint_wireless_frequencies:
+  - 2g4
+  - 5g
+
+
+accesspoint_network_base:
+  - name: globals 'globals'
+    options:
+      ula_prefix: "fc{{ '%02x:%04x:%04x' | format((255 | random(seed=inventory_hostname + '0')), (65535 | random(seed=inventory_hostname + '1')), (65535 | random(seed=inventory_hostname + '2'))) }}::/48"
+
+  - name: interface 'loopback'
+    options:
+      ifname: lo
+      proto: static
+      ipaddr: 127.0.0.1
+      netmask: 255.0.0.0
+
+  - name: interface 'mgmt'
+    options:
+      ifname: "{{ accesspoint_wired_interface }}.{{ network_zones.mgmt.vlan }}"
+      accept_ra: 0
+      proto: static
+      ipaddr: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}"
+      netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}"
+
+accesspoint_network_zones: {}
+
+
+accesspoint_wireless_devices:
+  - name: wifi-device 'radio5g'
+    options:
+      type: 'mac80211'
+      channel: "{{ accesspoint_wifi_channels['5g'][inventory_hostname] }}"
+      hwmode: '11a'
+      country: AT
+      path: "{{ accesspoint_wireless_device_paths['5g'] }}"
+      htmode: 'VHT80'
+
+  - name: wifi-device 'radio2g4'
+    options:
+      type: 'mac80211'
+      channel: "{{ accesspoint_wifi_channels['2g4'][inventory_hostname] }}"
+      hwmode: '11g'
+      country: AT
+      path: "{{ accesspoint_wireless_device_paths['2g4'] }}"
+      htmode: 'HT20'
+
+accesspoint_wireless_ifaces: {}
+
+
+openwrt_variant: openwrt
+openwrt_release: 18.06.1
+openwrt_arch: ar71xx
+openwrt_target: generic
+openwrt_profile: ubnt-unifiac-lite
+openwrt_output_image_suffixes:
+  - "generic-{{ openwrt_profile }}-squashfs-sysupgrade.bin"
+
+openwrt_packages_remove:
+  - ppp
+  - ppp-mod-pppoe
+  - dnsmasq
+  - firewall
+  - odhcpd
+  - odhcpd-ipv6only
+openwrt_packages_add:
+  - haveged
+  - htop
+  - ip
+  - less
+  - nano
+  - tcpdump-mini
+
+
+openwrt_mixin:
+  /etc/sysctl.conf:
+    content: |
+      # Defaults are configured in /etc/sysctl.d/* and can be customized in this file
+      #
+      # disable IP forwarding, we don't need it since we are
+      # only an AP that bridges VLANs to Wifi SSIDs
+      net.ipv4.conf.default.forwarding=0
+      net.ipv4.conf.all.forwarding=0
+      net.ipv4.ip_forward=0
+      net.ipv6.conf.default.forwarding=0
+      net.ipv6.conf.all.forwarding=0
+
+  /etc/dropbear/authorized_keys:
+    content: "{{ ssh_keys_root | join('\n') }}\n"
+
+  /etc/htoprc:
+    file: "{{ global_files_dir }}/common/htoprc"
+
+
+openwrt_uci:
+  system:
+    - name: system
+      options:
+        hostname: '{{ inventory_hostname }}'
+        timezone: 'CET-1CEST,M3.5.0,M10.5.0/3'
+        ttylogin: '0'
+        log_size: '64'
+        urandom_seed: '0'
+
+    - name: timeserver 'ntp'
+      options:
+        enabled: '1'
+        enable_server: '0'
+        server:
+          - '0.lede.pool.ntp.org'
+          - '1.lede.pool.ntp.org'
+          - '2.lede.pool.ntp.org'
+          - '3.lede.pool.ntp.org'
+
+  dropbear:
+    - name: dropbear
+      options:
+        PasswordAuth: 'off'
+        RootPasswordAuth: 'off'
+        Port: '22000'
+
+  network: "{{ accesspoint_network_base + accesspoint_network_zones }}"
+  wireless: "{{ accesspoint_wireless_devices + accesspoint_wireless_ifaces }}"
diff --git a/inventory/group_vars/ele-ap/main.yml b/inventory/group_vars/ele-ap/main.yml
index df5806ea..09426e2a 100644
--- a/inventory/group_vars/ele-ap/main.yml
+++ b/inventory/group_vars/ele-ap/main.yml
@@ -1,6 +1,6 @@
 ---
 accesspoint_wifi_channels:
-  2.4g:
+  2g4:
     ele-ap-forum0: 3
     ele-ap-forum1: 8
     ele-ap-forum2: 13
@@ -17,45 +17,19 @@ accesspoint_wifi_channels:
 
 accesspoint_zones:
   lan:
-    ssid: "elevate staff"
+    ssid: "elevate Staff"
     encryption: "psk2"
     key: "{{ vault_ele_ap.accesspoint_zones.lan.key }}"
   guest:
-    ssid: "elevate public"
+    ssid: "elevate Public"
     encryption: "psk2"
     key: "{{ vault_ele_ap.accesspoint_zones.guest.key }}"
   infoscreens:
-    ssid: "elevate infoscreens"
+    ssid: "elevate Infoscreens"
     encryption: "psk2"
     key: "{{ vault_ele_ap.accesspoint_zones.infoscreens.key }}"
 
 
-
-accesspoint_wired_interface: eth0
-accesspoint_wireless_device_paths:
-  2.4g: "platform/qca956x_wmac"
-  5g: "pci0000:00/0000:00:00.0"
-
-accesspoint_network_base:
-  - name: globals 'globals'
-    options:
-      ula_prefix: "fc{{ '%02x:%04x:%04x' | format((255 | random(seed=inventory_hostname + '0')), (65535 | random(seed=inventory_hostname + '1')), (65535 | random(seed=inventory_hostname + '2'))) }}::/48"
-
-  - name: interface 'loopback'
-    options:
-      ifname: lo
-      proto: static
-      ipaddr: 127.0.0.1
-      netmask: 255.0.0.0
-
-  - name: interface 'mgmt'
-    options:
-      ifname: "{{ accesspoint_wired_interface }}.{{ network_zones.mgmt.vlan }}"
-      accept_ra: 0
-      proto: static
-      ipaddr: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}"
-      netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}"
-
 accesspoint_network_zones: "{{ accesspoint_network_zones_yaml | from_yaml }}"
 accesspoint_network_zones_yaml: |
   {% for zone_name in accesspoint_zones.keys() %}
@@ -68,33 +42,10 @@ accesspoint_network_zones_yaml: |
   {% endfor %}
 
 
-accesspoint_wireless_devices:
-  - name: wifi-device 'radio5g'
-    options:
-      type: 'mac80211'
-      channel: "{{ accesspoint_wifi_channels['5g'][inventory_hostname] }}"
-      hwmode: '11a'
-      country: AT
-      path: "{{ accesspoint_wireless_device_paths['5g'] }}"
-      htmode: 'VHT80'
-
-  - name: wifi-device 'radio2g4'
-    options:
-      type: 'mac80211'
-      channel: "{{ accesspoint_wifi_channels['2.4g'][inventory_hostname] }}"
-      hwmode: '11g'
-      country: AT
-      path: "{{ accesspoint_wireless_device_paths['2.4g'] }}"
-      htmode: 'HT20'
-
-
 ## TODO: set up 802.11r see:
 ##        * https://www.reddit.com/r/openwrt/comments/515oea/finally_got_80211r_roaming_working/
 ##        * https://gist.github.com/lg/998d3e908d547bd9972a6bb604df377b
 accesspoint_wireless_ifaces: "{{ accesspoint_wireless_ifaces_yaml | from_yaml }}"
-accesspoint_wireless_frequencies:
-  - 2g4
-  - 5g
 accesspoint_wireless_ifaces_yaml: |
   {% for zone in accesspoint_zones.keys() %}
   {%   for freq in accesspoint_wireless_frequencies %}
@@ -110,79 +61,3 @@ accesspoint_wireless_ifaces_yaml: |
       key: '{{ accesspoint_zones[zone].key }}'
   {%   endfor %}
   {% endfor %}
-
-
-
-openwrt_variant: openwrt
-openwrt_release: 18.06.1
-openwrt_arch: ar71xx
-openwrt_target: generic
-openwrt_profile: ubnt-unifiac-lite
-openwrt_output_image_suffixes:
-  - "generic-{{ openwrt_profile }}-squashfs-sysupgrade.bin"
-
-openwrt_packages_remove:
-  - ppp
-  - ppp-mod-pppoe
-  - dnsmasq
-  - firewall
-  - odhcpd
-  - odhcpd-ipv6only
-openwrt_packages_add:
-  - haveged
-  - htop
-  - ip
-  - less
-  - nano
-  - tcpdump-mini
-
-
-openwrt_mixin:
-  /etc/sysctl.conf:
-    content: |
-      # Defaults are configured in /etc/sysctl.d/* and can be customized in this file
-      #
-      # disable IP forwarding, we don't need it since we are
-      # only an AP that bridges VLANs to Wifi SSIDs
-      net.ipv4.conf.default.forwarding=0
-      net.ipv4.conf.all.forwarding=0
-      net.ipv4.ip_forward=0
-      net.ipv6.conf.default.forwarding=0
-      net.ipv6.conf.all.forwarding=0
-
-  /etc/dropbear/authorized_keys:
-    content: "{{ ssh_keys_root | join('\n') }}\n"
-
-  /etc/htoprc:
-    file: "{{ global_files_dir }}/common/htoprc"
-
-
-openwrt_uci:
-  system:
-    - name: system
-      options:
-        hostname: '{{ inventory_hostname }}'
-        timezone: 'CET-1CEST,M3.5.0,M10.5.0/3'
-        ttylogin: '0'
-        log_size: '64'
-        urandom_seed: '0'
-
-    - name: timeserver 'ntp'
-      options:
-        enabled: '1'
-        enable_server: '0'
-        server:
-          - '0.lede.pool.ntp.org'
-          - '1.lede.pool.ntp.org'
-          - '2.lede.pool.ntp.org'
-          - '3.lede.pool.ntp.org'
-
-  dropbear:
-    - name: dropbear
-      options:
-        PasswordAuth: 'off'
-        RootPasswordAuth: 'off'
-        Port: '22000'
-
-  network: "{{ accesspoint_network_base + accesspoint_network_zones }}"
-  wireless: "{{ accesspoint_wireless_devices + accesspoint_wireless_ifaces }}"
diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml
index 649335f7..82d8d4d1 100644
--- a/inventory/group_vars/elevate-festival/main.yml
+++ b/inventory/group_vars/elevate-festival/main.yml
@@ -25,12 +25,19 @@ network_zones:
     vlan: 42
     prefix: 192.168.42.0/24
     offsets:
-      ele-ap-forum0: 210
-      ele-ap-forum1: 211
-      ele-ap-forum2: 212
-      ele-ap-dom0: 220
-      ele-ap-kunsthaus0: 230
-      ele-ap-orpheum0: 240
+      ele-sw-spreadencoder: 1
+      ele-sw-spreadmixer: 2
+      ele-sw-forum0: 10
+      ele-sw-forum1: 11
+      ele-sw-dom0: 20
+      ele-sw-kunsthaus0: 30
+      ele-sw-orpheum0: 40
+      ele-ap-forum0: 110
+      ele-ap-forum1: 111
+      ele-ap-forum2: 112
+      ele-ap-dom0: 120
+      ele-ap-kunsthaus0: 130
+      ele-ap-orpheum0: 140
       ele-router: 254
 
   mixer:
@@ -39,7 +46,7 @@ network_zones:
     offsets:
       kuschelbaer: 48
       atem: 208
-      x32: 216
+      x32core: 216
 
   infoscreens:
     vlan: 73