From e822439d0a553d036b991514e18060c7e36b7315 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 21 Feb 2023 21:57:08 +0100
Subject: ele-ups: upgrade to newest openwrt

---
 inventory/group_vars/ups/vars.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'inventory/group_vars/ups')

diff --git a/inventory/group_vars/ups/vars.yml b/inventory/group_vars/ups/vars.yml
index 99328aec..842c5adb 100644
--- a/inventory/group_vars/ups/vars.yml
+++ b/inventory/group_vars/ups/vars.yml
@@ -14,15 +14,18 @@ openwrt_packages_remove:
   - ppp-mod-pppoe
   - dnsmasq
   - firewall
+  - firewall4
   - odhcpd
   - odhcpd-ipv6only
+  - wpad-basic-wolfssl
+  - libustream-wolfssl
+  - nftables
 openwrt_packages_add:
+  - hostapd-basic-openssl
+  - libustream-openssl
   - haveged
   - htop
-  - ip
-  - less
-  - nano
-  - tcpdump-mini
+  - ip-tiny
   - usbutils
   - kmod-usb-storage
   - nut-server
@@ -78,13 +81,9 @@ openwrt_uci:
 
     - name: timeserver 'ntp'
       options:
-        enabled: '0'
+        enabled: '{{ ups_ntp_servers is defined | ternary("1", "0") }}'
         enable_server: '0'
-        server:
-          - '0.lede.pool.ntp.org'
-          - '1.lede.pool.ntp.org'
-          - '2.lede.pool.ntp.org'
-          - '3.lede.pool.ntp.org'
+        server: "{{ ups_ntp_servers | default([]) }}"
 
   dropbear:
     - name: dropbear
@@ -113,11 +112,15 @@ openwrt_uci:
         netmask: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr('netmask') }}"
         accept_ra: 0
 
+  uhttpd:
+    - name: uhttpd main
+      options:
+        enabled: '0'
+
   prometheus-node-exporter-lua:
     - name: prometheus-node-exporter-lua 'main'
       options:
         listen_interface: 'mgmt'
-        listen_ipv6: '0'
         listen_port: '9100'
 
   nut_server:
-- 
cgit v1.2.3