Merge pull request socallinuxexpo#651 from socallinuxexpo/rh/17052077…

…41facts [READY] - Updating 21x show facts for openwrt
MrHamel · Jan 14, 2024 · b1f8527 · b1f8527
2 parents f8243d9 + 8b69cbb
commit b1f8527
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 47 deletions.
diff --git a/facts/secrets/ar71xx-openwrt-example.yaml b/facts/secrets/ar71xx-openwrt-example.yaml
@@ -2,7 +2,7 @@
 root_hash: "$1$zh0PjBbB$f9aFGDX9vNYNdSRexhib8/"
 
 # Bump for each year for scale
-scale: 19
+scale: 21
 
 sshd:
  password_auth: true
@@ -12,9 +12,6 @@ rsyslog:
   port: '514'
   protocol: 'udp'
 
-zabbix:
-  server: 'zabbix.scale.lan'
-
 ntp:
   server: '0.openwrt.pool.ntp.org'
 
@@ -108,29 +105,21 @@ wireless:
       channel: '11'
       path: 'pci0000:00/0000:00:11.0'
       htmode: 'HT20'
-      txpower: '8'
+      txpower: '12'
       networks:
         - ssid: 'scale-public-slow'
-          password: 'tuxlinux'
+          password: 'penguins'
           interface: 'scaleslow'
           disabled: 0
-        - ssid: 'scale-staff-24'
-          password: 'testpassword'
-          interface: 'staffwifi'
-          disabled: 0
     - name: 'radio1'
       type: 'mac80211'
       hwmode: '11a'
       channel: '36'
       path: 'pci0000:00/0000:00:12.0'
       htmode: 'HT20'
-      txpower: '8'
+      txpower: '12'
       networks:
         - ssid: 'scale-public-fast'
-          password: 'tuxlinux'
+          password: 'penguins'
           interface: 'scalefast'
           disabled: 0
-        - ssid: 'scale-staff-5'
-          password: 'testpassword'
-          interface: 'staffwifi'
-          disabled: 0
diff --git a/facts/secrets/ar71xx-openwrt-show.yaml b/facts/secrets/ar71xx-openwrt-show.yaml
@@ -2,7 +2,7 @@
 root_hash: "$6$A.qZ6.jIUKL/WS0P$lrIP99C3BgP7OMmVlYOGaErcatjipS0cL0AiVFeTAAk6IwBkstXz/EpMv1SOtO8rDifzC.mLta3eOvG/q4cRq."
 
 # Bump for each year for scale
-scale: 20
+scale: 21
 
 sshd:
  password_auth: false
@@ -12,9 +12,6 @@ rsyslog:
   port: '514'
   protocol: 'udp'
 
-zabbix:
-  server: 'monitor.scale.lan'
-
 ntp:
   server: '0.openwrt.pool.ntp.org'
 

diff --git a/facts/secrets/mt7622-openwrt-example.yaml b/facts/secrets/mt7622-openwrt-example.yaml
@@ -12,9 +12,6 @@ rsyslog:
   port: '514'
   protocol: 'udp'
 
-zabbix:
-  server: 'zabbix.scale.lan'
-
 ntp:
   server: '0.openwrt.pool.ntp.org'
 

diff --git a/facts/secrets/mt7622-openwrt-show.yaml b/facts/secrets/mt7622-openwrt-show.yaml
@@ -0,0 +1,18 @@
+# scale
+root_hash: "$1$zh0PjBbB$f9aFGDX9vNYNdSRexhib8/"
+
+# Bump for each year for scale
+scale: 21
+
+sshd:
+ password_auth: false
+
+rsyslog:
+  server: 'loghost.scale.lan'
+  port: '514'
+  protocol: 'udp'
+
+ntp:
+  server: '0.openwrt.pool.ntp.org'
+
+# Wired/Wireless config can directly be found in files dir
diff --git a/openwrt/files/etc/config/lldpd b/openwrt/files/etc/config/lldpd
@@ -13,4 +13,4 @@ config lldpd config
        # Set class of device
        option lldp_class 4
        # if empty, the distribution description is sent
-       option lldp_description "OpenWrt System"
+       option lldp_description "{{ env.Getenv "TARGET" }} SCaLE OpenWrt"
diff --git a/tests/unit/openwrt/golden/ar71xx/etc/config/lldpd b/tests/unit/openwrt/golden/ar71xx/etc/config/lldpd
@@ -13,4 +13,4 @@ config lldpd config
        # Set class of device
        option lldp_class 4
        # if empty, the distribution description is sent
-       option lldp_description "OpenWrt System"
+       option lldp_description "ar71xx SCaLE OpenWrt"
diff --git a/tests/unit/openwrt/golden/ar71xx/etc/config/wireless.0 b/tests/unit/openwrt/golden/ar71xx/etc/config/wireless.0
@@ -5,7 +5,7 @@ config wifi-device 'radio0'
 	option path 'pci0000:00/0000:00:11.0'
 	option htmode 'HT20'
 	option channel '11'
-	option txpower '8'
+	option txpower '12'
 	option country 'US'
 
 config wifi-device 'radio1'
@@ -14,7 +14,7 @@ config wifi-device 'radio1'
 	option path 'pci0000:00/0000:00:12.0'
 	option htmode 'HT20'
 	option channel '36'
-	option txpower '8'
+	option txpower '12'
 	option country 'US'
 
 
@@ -25,16 +25,7 @@ config wifi-iface 'scaleslow_radio0'
 	option mode 'ap'
 	option network 'scaleslow'
 	option encryption 'psk2'
-	option key 'tuxlinux'
-	option disabled '0'
-
-config wifi-iface 'staffwifi_radio0'
-	option device 'radio0'
-        option ssid 'scale-staff-24'
-	option mode 'ap'
-	option network 'staffwifi'
-	option encryption 'psk2'
-	option key 'testpassword'
+	option key 'penguins'
 	option disabled '0'
 
 config wifi-iface 'scalefast_radio1'
@@ -43,15 +34,6 @@ config wifi-iface 'scalefast_radio1'
 	option mode 'ap'
 	option network 'scalefast'
 	option encryption 'psk2'
-	option key 'tuxlinux'
-	option disabled '0'
-
-config wifi-iface 'staffwifi_radio1'
-	option device 'radio1'
-        option ssid 'scale-staff-5'
-	option mode 'ap'
-	option network 'staffwifi'
-	option encryption 'psk2'
-	option key 'testpassword'
+	option key 'penguins'
 	option disabled '0'