From 39a16ef4ff7b586931a0b8e70a277028639e207e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 25 Oct 2023 14:56:41 +0200
Subject: upgrade ch-ap, ch-router et-al to openwrt 23.05

---
 inventory/group_vars/accesspoints/vars.yml | 4 ++--
 inventory/group_vars/ups/vars.yml          | 7 ++-----
 inventory/host_vars/ch-gw-c3voc.yml        | 2 +-
 inventory/host_vars/ch-router.yml          | 1 +
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'inventory')

diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml
index 1a841e13..8c4d44db 100644
--- a/inventory/group_vars/accesspoints/vars.yml
+++ b/inventory/group_vars/accesspoints/vars.yml
@@ -138,9 +138,9 @@ openwrt_packages_remove:
   - firewall4
   - odhcpd
   - odhcpd-ipv6only
-  - wpad-basic-wolfssl
+  - wpad-basic-mbedtls
 openwrt_packages_add:
-  - hostapd-wolfssl
+  - hostapd-mbedtls
   - haveged
   - htop
   - ip
diff --git a/inventory/group_vars/ups/vars.yml b/inventory/group_vars/ups/vars.yml
index 842c5adb..bfcbb0a7 100644
--- a/inventory/group_vars/ups/vars.yml
+++ b/inventory/group_vars/ups/vars.yml
@@ -17,17 +17,14 @@ openwrt_packages_remove:
   - firewall4
   - odhcpd
   - odhcpd-ipv6only
-  - wpad-basic-wolfssl
-  - libustream-wolfssl
+  - wpad-basic-mbedtls
+  - libustream-mbedtls
   - nftables
 openwrt_packages_add:
   - hostapd-basic-openssl
   - libustream-openssl
   - haveged
-  - htop
-  - ip-tiny
   - usbutils
-  - kmod-usb-storage
   - nut-server
   - nut-driver-usbhid-ups
   - nut-upsc
diff --git a/inventory/host_vars/ch-gw-c3voc.yml b/inventory/host_vars/ch-gw-c3voc.yml
index 3da27bf7..e08da8e7 100644
--- a/inventory/host_vars/ch-gw-c3voc.yml
+++ b/inventory/host_vars/ch-gw-c3voc.yml
@@ -1,7 +1,7 @@
 ---
 install:
   vm:
-    memory: 64M
+    memory: 128M
     numcpus: 1
     autostart: true
   disks:
diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index 16f70198..9c07b42d 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -305,6 +305,7 @@ openwrt_uci:
         dh: '/etc/openvpn/dhparams'
 
         tls_cipher: 'DHE-RSA-AES256-SHA'
+        tls_version_min: '1.1'
         cipher: 'AES-256-CBC'
         auth: 'SHA256'
         comp_lzo: 'yes'
-- 
cgit v1.2.3