diff --git a/locations/huette.yml b/locations/huette.yml index e7c89966e..d93cbc9d6 100644 --- a/locations/huette.yml +++ b/locations/huette.yml @@ -16,8 +16,12 @@ hosts: role: corerouter model: "zyxel_nwa55axe" wireless_profile: freifunk_default + openwrt_version: snapshot + # imagebuilder: /home/user/w/ff/bbb-configs/openwrt-imagebuilder-ramips-mt7621.Linux-x86_64.tar.zst + log_size: 1024 host__rclocal__to_merge: - - 'cat /etc/crontabs/root | grep reboot 2>/dev/null || echo "15 * * * * reboot" >> /etc/crontabs/root && /etc/init.d/cron restart' + - 'echo 1 > /sys/kernel/debug/ieee80211/phy0/mt76/fw_debug_wm' + ssl__packages__to_merge: [] ipv6_prefix: '2001:bf7:830:2600::/56' @@ -39,17 +43,17 @@ networks: mesh_iface: mesh # MESH - 2.4 GHz 802.11s - - vid: 21 - role: mesh - name: mesh_11s_2ghz - prefix: 10.31.114.2/32 - ipv6_subprefix: -21 - # make mesh_metric(s) for 2GHz worse than 5GHz - mesh_metric: 1024 - mesh_metric_lqm: ['default 0.8'] - mesh_ap: huette-core - mesh_radio: 11g_standard - mesh_iface: mesh + # - vid: 21 + # role: mesh + # name: mesh_11s_2ghz + # prefix: 10.31.114.2/32 + # ipv6_subprefix: -21 + # # make mesh_metric(s) for 2GHz worse than 5GHz + # mesh_metric: 1024 + # mesh_metric_lqm: ['default 0.8'] + # mesh_ap: huette-core + # mesh_radio: 11g_standard + # mesh_iface: mesh - vid: 40 role: dhcp diff --git a/locations/hway.yml b/locations/hway.yml index b1e3f5b21..30478e257 100644 --- a/locations/hway.yml +++ b/locations/hway.yml @@ -13,16 +13,16 @@ contacts: # - 10.31.255.192/27 dhcp # - 10.31.255.224/28 prdhcp # - 10.31.255.240/29 mesh -# - 10.31.255.240/32 mesh_emma -# - 10.31.255.241/32 ts_wg1 +# - 10.31.255.240/32 mesh_lan +# - 10.31.255.241/32 ts_wg0 # - 10.31.255.248/29 mgmt ipv6_prefix: 2001:bf7:820:2c00::/56 hosts: - # Thinkcentre M720q, i5-8500T, ??GB RAM, ???GB NVMe - # Intel I219 V7 - eth0 - # ConnectX-4 LX CX4121B - eth1, eth2 + # Thinkcentre M720q, i5-8500T, 16GB RAM, 1TB NVMe + # eth0 - Intel I219 V7 + # eth1 eth2 - ConnectX-4 Lx CX4121B - hostname: hway-core role: corerouter model: x86-64 @@ -37,13 +37,14 @@ hosts: - hostname: hway-ap1 role: ap - model: zyxel_nwa50ax - wireless_profile: hway - - - hostname: hway-ap2 - role: ap - model: mikrotik_wap-ac wireless_profile: hway + model: zyxel_nwa50ax + openwrt_version: snapshot + log_size: 1024 + # imagebuilder: /home/user/w/ff/bbb-configs/openwrt-imagebuilder-ramips-mt7621.Linux-x86_64.tar.zst + host__rclocal__to_merge: + - "echo 1 > /sys/kernel/debug/ieee80211/phy0/mt76/fw_debug_wm" + ssl__packages__to_merge: [] snmp_devices: @@ -55,7 +56,7 @@ networks: - vid: 10 role: mesh - name: mesh_emma + name: mesh_lan prefix: 10.31.255.240/32 ipv6_subprefix: -10 @@ -89,7 +90,6 @@ networks: hway-switch: 2 # .255.250 hway-kiehlufer: 3 # .255.251 hway-ap1: 4 # .255.252 - hway-ap2: 5 # .255.253 - vid: 50 ifname: eth1 @@ -104,11 +104,9 @@ networks: location__channel_assignments_11a_standard__to_merge: hway-ap1: 36-40 - hway-ap2: 44-40 location__channel_assignments_11b_standard__to_merge: hway-ap1: 13-20 - hway-ap2: 9-20 location__wireless_profiles__to_merge: - name: hway diff --git a/locations/kiehlufer.yml b/locations/kiehlufer.yml index 0fdf57855..7984effc7 100644 --- a/locations/kiehlufer.yml +++ b/locations/kiehlufer.yml @@ -30,11 +30,21 @@ hosts: role: corerouter model: "cudy_x6-v1" wireless_profile: freifunk_default + openwrt_version: snapshot + # imagebuilder: /home/user/w/ff/bbb-configs/openwrt-imagebuilder-ramips-mt7621.Linux-x86_64.tar.zst + log_size: 1024 + ssl__packages__to_merge: [] - hostname: kiehlufer-huette role: ap model: "zyxel_nwa55axe" wireless_profile: kiehlufer5g + openwrt_version: snapshot + # imagebuilder: /home/user/w/ff/bbb-configs/openwrt-imagebuilder-ramips-mt7621.Linux-x86_64.tar.zst + log_size: 1024 + host__rclocal__to_merge: + - "echo 1 > /sys/kernel/debug/ieee80211/phy0/mt76/fw_debug_wm" + ssl__packages__to_merge: [] - hostname: kiehlufer-nf-wbp1 role: ap diff --git a/locations/kub.yml b/locations/kub.yml index fa95fcb92..2b2e1afd9 100644 --- a/locations/kub.yml +++ b/locations/kub.yml @@ -19,7 +19,13 @@ hosts: - hostname: kub-ap1 role: ap model: "cudy_x6-v1" + openwrt_version: snapshot + # imagebuilder: /home/user/w/ff/bbb-configs/openwrt-imagebuilder-ramips-mt7621.Linux-x86_64.tar.zst + log_size: 1024 host__rclocal__to_merge: + - 'echo 1 > /sys/kernel/debug/ieee80211/phy0/mt76/fw_debug_wm' + - 'echo 1 > /sys/kernel/debug/ieee80211/phy1/mt76/fw_debug_wm' + - '' - '#' - '# This script adjusts the configuration of vlans. This is especially' - '# useful with uswflex and custom port configs' @@ -67,6 +73,7 @@ hosts: - 'uci commit network' - 'sync' - 'reload_config' + ssl__packages__to_merge: [] snmp_devices: - hostname: kub-simeon diff --git a/locations/radbahn.yml b/locations/radbahn.yml index d0f5b7149..df5b68427 100644 --- a/locations/radbahn.yml +++ b/locations/radbahn.yml @@ -18,15 +18,25 @@ hosts: role: ap model: zyxel_nwa55axe wireless_profile: radbahn + openwrt_version: snapshot + # imagebuilder: /home/user/w/ff/bbb-configs/openwrt-imagebuilder-ramips-mt7621.Linux-x86_64.tar.zst + log_size: 1024 host__rclocal__to_merge: - - 'cat /etc/crontabs/root | grep reboot 2>/dev/null || echo "15 * * * * reboot" >> /etc/crontabs/root && /etc/init.d/cron restart' + - 'echo 1 > /sys/kernel/debug/ieee80211/phy0/mt76/fw_debug_wm' + - 'echo 1 > /sys/kernel/debug/ieee80211/phy1/mt76/fw_debug_wm' + ssl__packages__to_merge: [] - hostname: radbahn-w-nf role: ap model: zyxel_nwa55axe wireless_profile: radbahn + openwrt_version: snapshot + # imagebuilder: /home/user/w/ff/bbb-configs/openwrt-imagebuilder-ramips-mt7621.Linux-x86_64.tar.zst + log_size: 1024 host__rclocal__to_merge: - - 'cat /etc/crontabs/root | grep reboot 2>/dev/null || echo "45 * * * * reboot" >> /etc/crontabs/root && /etc/init.d/cron restart' + - 'echo 1 > /sys/kernel/debug/ieee80211/phy0/mt76/fw_debug_wm' + - 'echo 1 > /sys/kernel/debug/ieee80211/phy1/mt76/fw_debug_wm' + ssl__packages__to_merge: [] snmp_devices: diff --git a/locations/suedblock.yml b/locations/suedblock.yml index 7da39731e..8e1675666 100644 --- a/locations/suedblock.yml +++ b/locations/suedblock.yml @@ -20,6 +20,12 @@ hosts: wireless_profile: freifunk_default dhcp_no_ping: false openwrt_version: snapshot + # imagebuilder: /home/user/w/ff/bbb-configs/openwrt-imagebuilder-ramips-mt7621.Linux-x86_64.tar.zst + log_size: 1024 + host__rclocal__to_merge: + - 'echo 1 > /sys/kernel/debug/ieee80211/phy0/mt76/fw_debug_wm' + - 'echo 1 > /sys/kernel/debug/ieee80211/phy1/mt76/fw_debug_wm' + ssl__packages__to_merge: [] # 10.248.13.0/24 # 10.248.13.0/29 - mgmt