1 Commits
inuse ... main

Author SHA1 Message Date
bbd4085a2c Apparently stp fucking breaks everything god damn
it god damn it god damn it, whatever
2024-05-20 21:15:48 -04:00
6 changed files with 216 additions and 492 deletions

View File

@@ -9,14 +9,6 @@ templates:
- name: ath10k-firmware-qca988x
state: present
package_ath10k_99x0_full: &package_ath10k_99x0_full
- name: kmod-ath10k-ct
state: present
- name: ath10k-firmware-qca99x0-ct
state: absent
- name: ath10k-firmware-qca99x0-ct-full-htt
state: present
package_wpad_mesh: &package_wpad_mesh
- name: wpad-basic-wolfssl
state: absent
@@ -46,9 +38,9 @@ templates:
openwrt:
hosts:
ap3825i7:
ap3825i1:
packages:
ath10k: *package_ath10k_mesh
wpad: *package_wpad_mesh
network:
@@ -58,288 +50,18 @@ openwrt:
ports:
- eth0
- eth1
- name: br-vgolan
type: bridge
ports:
- eth0.2
- eth1.2
stp: 1
interface:
- key: lan
device: br-lan
proto: dhcp
- key: vgolan
device: br-vgolan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: ath9k_5
channel: 149
- name: radio1
path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
template: ath9k_2
channel: 11
wifi_iface:
- ifname: labb2
device: radio1
template: labb
- ifname: labb5
device: radio0
template: labb
- ifname: vgo2
device: radio1
template: vgo2
- ifname: vgo5
device: radio0
template: vgo5
- ifname: vgo2n
device: radio1
template: vgo2n
- ifname: vgo5n
device: radio0
template: vgo5n
ap3825i8:
packages:
wpad: *package_wpad_mesh
network:
device:
- name: br-lan
type: bridge
ports:
- eth0
- eth1
- name: br-vgolan
type: bridge
ports:
- eth0.2
- eth1.2
interface:
- key: lan
device: br-lan
proto: dhcp
- key: vgolan
device: br-vgolan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: ath9k_5
channel: 157
- name: radio1
path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
template: ath9k_2
channel: 6
wifi_iface:
- ifname: labb2
device: radio1
template: labb
- ifname: labb5
device: radio0
template: labb
- ifname: vgo2
device: radio1
template: vgo2
- ifname: vgo5
device: radio0
template: vgo5
- ifname: vgo2n
device: radio1
template: vgo2n
- ifname: vgo5n
device: radio0
template: vgo5n
ap3825i9:
packages:
wpad: *package_wpad_mesh
network:
device:
- name: br-lan
type: bridge
ports:
- eth0
- eth1
- name: br-vgolan
type: bridge
ports:
- eth0.2
- eth1.2
interface:
- key: lan
device: br-lan
proto: dhcp
- key: vgolan
device: br-vgolan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: ath9k_5
channel: 161
- name: radio1
path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
template: ath9k_2
channel: 1
wifi_iface:
- ifname: labb2
device: radio1
template: labb
- ifname: labb5
device: radio0
template: labb
- ifname: vgo2
device: radio1
template: vgo2
- ifname: vgo5
device: radio0
template: vgo5
- ifname: vgo2n
device: radio1
template: vgo2n
- ifname: vgo5n
device: radio0
template: vgo5n
ap3825i4:
packages:
wpad: *package_wpad_mesh
network:
device:
- name: br-lan
type: bridge
ports:
- eth0
- eth1
- name: br-vgolan
type: bridge
ports:
- eth0.2
- eth1.2
interface:
- key: lan
device: br-lan
proto: dhcp
- key: vgolan
device: br-vgolan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: ath9k_5
channel: 36
- name: radio1
path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
template: ath9k_2
channel: 1
wifi_iface:
- ifname: labb2
device: radio1
template: labb
- ifname: labb5
device: radio0
template: labb
- ifname: vgo2
device: radio1
template: vgo2
- ifname: vgo5
device: radio0
template: vgo5
- ifname: vgo2n
device: radio1
template: vgo2n
- ifname: vgo5n
device: radio0
template: vgo5n
ap3825i6:
packages:
wpad: *package_wpad_mesh
network:
device:
- name: br-lan
type: bridge
ports:
- eth0
- eth1
- name: br-vgolan
type: bridge
ports:
- eth0.2
- eth1.2
interface:
- key: lan
device: br-lan
proto: dhcp
- key: vgolan
device: br-vgolan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: ath9k_5
template: qca9880_5
channel: 48
- name: radio1
@@ -348,14 +70,127 @@ openwrt:
channel: 11
wifi_iface:
- ifname: labbmesh5
device: radio0
template: labbmesh
disabled: 0
- ifname: labb2
device: radio1
template: labb
ap3825i4:
packages:
ath10k: *package_ath10k_mesh
wpad: *package_wpad_mesh
network:
device:
- name: br-lan
type: bridge
ports:
- eth0
- eth1.7
stp: 1
- name: br-vgolan
type: bridge
ports:
- eth0.2
- eth1.2
stp: 1
interface:
- key: lan
device: br-lan
proto: dhcp
- key: vgolan
device: br-vgolan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: qca9880_5
channel: 48
- name: radio1
path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
template: ath9k_2
channel: 6
wifi_iface:
- ifname: vgo2
device: radio1
template: vgo2
disabled: 0
- ifname: vgomesh2
device: radio1
template: vgomesh2
disabled: 0
- ifname: vgo5
device: radio0
template: vgo5
disabled: 0
- ifname: labb2
device: radio1
template: labb
- ifname: labbmesh5
device: radio0
template: labbmesh
disabled: 0
- ifname: labb5
device: radio0
template: labb
- ifname: labbmesh2
device: radio1
template: labbmesh
disabled: 0
ap3825i3:
network:
device:
- name: br-lan
type: bridge
ports:
- eth0
- name: br-vgolan
type: bridge
ports:
- eth0.2
- eth1
interface:
- key: lan
device: br-lan
proto: dhcp
- key: vgolan
device: br-vgolan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: qca9880_5
channel: 157
- name: radio1
path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
template: ath9k_2
channel: 1
wifi_iface:
- ifname: vgo2
device: radio1
template: vgo2
@@ -364,26 +199,66 @@ openwrt:
device: radio0
template: vgo5
- ifname: vgo2n
- ifname: labb2
device: radio1
template: vgo2n
template: labb
- ifname: vgo5n
- ifname: labb5
device: radio0
template: vgo5n
ap3825i10:
packages:
wpad: *package_wpad_mesh
ath10k: *package_ath10k_mesh
template: labb
mr16_4:
network:
device:
- name: br-lan
type: bridge
ports:
- eth0
- eth1
stp: 1
interface:
- key: lan
device: br-lan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: pci0000:00/0000:00:11.0
template: ath9k_2
hwmode:
band: 2g
channel: 6
disabled: 1
- name: radio1
path: pci0000:00/0000:00:12.0
template: ath9k_5
hwmode:
band: 5g
channel: 48
wifi_iface:
- ifname: labbmesh2
device: radio0
template: labbmesh
- ifname: labbmesh5
device: radio1
template: labbmesh
ap3825i7:
packages:
ath10k: *package_ath10k_mesh
wpad: *package_wpad_mesh
network:
device:
- name: br-lan
type: bridge
ports:
- eth0.7
- eth1.7
- name: br-vgolan
type: bridge
@@ -402,6 +277,7 @@ openwrt:
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: qca9880_5
@@ -413,14 +289,26 @@ openwrt:
channel: 1
wifi_iface:
- ifname: vgo5c
- ifname: labb2
device: radio0
template: vgo5c
template: labb
ap3825i11:
- ifname: labb5
device: radio1
template: labb
- ifname: vgo2
device: radio0
template: vgo2
- ifname: vgo5
device: radio1
template: vgo5
ap3825i6:
packages:
wpad: *package_wpad_mesh
ath10k: *package_ath10k_mesh
wpad: *package_wpad_mesh
network:
device:
@@ -428,12 +316,13 @@ openwrt:
type: bridge
ports:
- eth1
stp: 1
- name: br-vgolan
type: bridge
ports:
- eth0
- eth1.2
stp: 1
interface:
- key: lan
@@ -457,96 +346,20 @@ openwrt:
channel: 1
wifi_iface:
- ifname: vgo5c
- ifname: vgo2
device: radio1
template: vgo2
disabled: 0
- ifname: vgo5
device: radio0
template: vgo5c
template: vgo5
disabled: 0
ap3825i12:
packages:
wpad: *package_wpad_mesh
ath10k: *package_ath10k_mesh
- ifname: labb2
device: radio1
template: labb
network:
device:
- name: br-lan
type: bridge
ports:
- eth0
- eth1
- name: br-vgolan
type: bridge
ports:
- eth0.2
- eth1.2
interface:
- key: lan
device: br-lan
proto: dhcp
- key: vgolan
device: br-vgolan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: qca9880_5
channel: 157
- name: radio1
path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
template: ath9k_2
channel: 1
wifi_iface:
- ifname: vgo5c
- ifname: labb5
device: radio0
template: vgo5c
ap3825i13:
packages:
wpad: *package_wpad_mesh
ath10k: *package_ath10k_mesh
network:
device:
- name: br-lan
type: bridge
ports:
- eth0
- eth1
- name: br-vgolan
type: bridge
ports:
- eth0.2
- eth1.2
interface:
- key: lan
device: br-lan
proto: dhcp
- key: vgolan
device: br-vgolan
proto: dhcp
wireless:
wifi_device:
- name: radio0
path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
template: qca9880_5
channel: 157
- name: radio1
path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
template: ath9k_2
channel: 1
wifi_iface:
- ifname: vgo5c
device: radio0
template: vgo5c
template: labb

View File

@@ -25,14 +25,10 @@
- name: Update authorized keys
lineinfile:
path: /etc/dropbear/authorized_keys
line: "{{ item }}"
line: "{{ lookup('file', lookup('env', 'HOME') + '/.ssh/id_ed25519.pub') }}"
state: present
create: yes
mode: 644
loop:
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEysezzehXkUOm8u8nXP+YloSE8JpKYevCslao5tB2l root@neo"
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILCYhh9Fjo8bV5rV6UfvwDgR+NlmCfKuR14iXgmILeDj hurricos@bielik"
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPh3R8BXv9geqJMaxi134Y5hcOVZPQ/rfghjszYMFG5z hurricos@zephyr"
- name: Disable Root password authentication
uci:

View File

@@ -29,15 +29,6 @@
key: network
notify: restart network
- name: Tear down the default wifi-iface(s)
uci:
config: wireless
command: absent
section: "{{ item }}"
loop:
- default_radio0
- default_radio1
- name: Setup wireless devices (radios)
uci:
command: section
@@ -69,10 +60,6 @@
device: "{{ item.device | default(wifi_iface[item.template].device) }}"
network: "{{ item.network | default(wifi_iface[item.template].network) }}"
ssid: "{{ item.ssid | default(wifi_iface[item.template].ssid) | default() }}"
bss_transition: "{{ item.bss_transition | default(wifi_iface[item.template].bss_transition) | default() }}"
ieee80211k: "{{ item.ieee80211k | default(wifi_iface[item.template].ieee80211k) | default() }}"
ieee80211r: "{{ item.ieee80211r | default(wifi_iface[item.template].ieee80211r) | default() }}"
ieee80211v: "{{ item.ieee80211v | default(wifi_iface[item.template].ieee80211v) | default() }}"
mesh_id: "{{ item.mesh_id | default(wifi_iface[item.template].mesh_id) | default() }}"
encryption: "{{ item.encryption | default(wifi_iface[item.template].encryption) }}"
key: "{{ item.key | default(wifi_iface[item.template].key) }}"

View File

@@ -7,10 +7,6 @@ wifi_iface:
key: 'password'
skip_inactivity_poll: '1'
disassoc_low_ack: '0'
ieee80211k: 1
ieee80211r: 1
ieee80211v: 1
bss_transition: 1
vgo: &vgo_wifi_iface
<<: *default_wifi_iface
@@ -31,21 +27,12 @@ wifi_iface:
<<: *vgo_wifi_iface
ssid: 'Vermont Green Offices 5G'
vgo2n:
<<: *vgo_wifi_iface
ssid: 'Vermont Green Offices'
vgo5n:
<<: *vgo_wifi_iface
ssid: 'Vermont Green Offices'
vgo5c:
<<: *vgo_wifi_iface
ssid: 'Vermont Green Offices 5AC'
ieee80211k: 0
ieee80211r: 0
ieee80211v: 0
bss_transition: 0
mesh: &mesh_wifi_iface
ssid:
mode: 'mesh'
encryption: 'psk2+ccmp'
skip_inactivity_poll: 1
disassoc_low_ack:
labb: &labb_wifi_iface
<<: *default_wifi_iface
@@ -63,6 +50,16 @@ wifi_iface:
<<: *labb_wifi_iface
encryption: 'sae'
labbmesh:
<<: *labb_wifi_iface
<<: *mesh_wifi_iface
mesh_id: 'Laboratory B_Mesh'
vgomesh2:
<<: *vgo_wifi_iface
<<: *mesh_wifi_iface
mesh_id: 'Vermont Green Offices 2G_Mesh'
wifi_device:
default: &default_wifi_device

View File

@@ -3,15 +3,3 @@
argv:
- touch
- /tmp/test_proof
- name: Restart prometheus-ucode
service:
name: prometheus-node-exporter-ucode
state: restarted
enabled: yes
- name: Restart prometheus-lua
service:
name: prometheus-node-exporter-lua
state: restarted
enabled: yes

View File

@@ -27,60 +27,3 @@
state: "{{ item.state }}"
loop: "{{ packages.ath10k | default([]) }}"
notify: "{{ item.notify | default([]) }}"
# - name: Install prometheus-ucode packages
# opkg:
# name: "{{ item }}"
# state: present
# loop:
# - prometheus-node-exporter-ucode
# - prometheus-node-exporter-ucode-wifi
# - prometheus-node-exporter-ucode-netstat
# - prometheus-node-exporter-ucode-openwrt
# notify: Restart prometheus-ucode
# - name: Setup prometheus-ucode properly
# uci:
# command: set
# key: 'prometheus-node-exporter-ucode.main'
# value:
# listen_interface: 'lan'
# notify: Restart prometheus-ucode
# - name: commit changes to prometheus-node-exporter-ucode
# uci:
# command: commit
# key: prometheus-node-exporter-ucode
- name: Install prometheus-lua packages
opkg:
name: "{{ item }}"
state: present
loop:
- prometheus-node-exporter-lua
- prometheus-node-exporter-lua-wifi
- prometheus-node-exporter-lua-wifi_stations
- prometheus-node-exporter-lua-hostapd_stations
- prometheus-node-exporter-lua-hostapd_ubus_stations
- prometheus-node-exporter-lua-netstat
- prometheus-node-exporter-lua-dawn
notify: Restart prometheus-lua
- name: Setup prometheus-lua properly
uci:
command: set
key: 'prometheus-node-exporter-lua.main'
value:
listen_interface: 'lan'
notify: Restart prometheus-lua
- name: commit changes to prometheus-node-exporter-lua
uci:
command: commit
key: prometheus-node-exporter-lua
- name: Install dawn
opkg:
name: dawn
state: present