From aabed694d3bd27b4e1bb8f7477f0d280554effc3 Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Tue, 23 Jan 2024 22:18:18 +0100
Subject: [PATCH] fix(image-customization.lua): move away from site.mk
 (required by v2023.2) + add tls packages

solves #54
---
 image-customization.lua | 47 +++++++++++++++++++++++++++++++++++++++++
 site.mk                 | 39 ----------------------------------
 2 files changed, 47 insertions(+), 39 deletions(-)
 create mode 100644 image-customization.lua

diff --git a/image-customization.lua b/image-customization.lua
new file mode 100644
index 0000000..32d4c22
--- /dev/null
+++ b/image-customization.lua
@@ -0,0 +1,47 @@
+features({
+  'autoupdater',
+  'ebtables-filter-multicast',
+  'ebtables-filter-ra-dhcp',
+  'ebtables-limit-arp',
+  'mesh-batman-adv-15',
+  'mesh-vpn-fastd',
+  'respondd',
+  'status-page',
+  'web-advanced',
+  'web-wizard',
+})
+
+packages({
+  'gluon-ssid-changer',
+  'respondd-module-airtime',
+  'gluon-config-mode-core',
+  'gluon-config-mode-domain-select',
+  'gluon-config-mode-geo-location',
+  'gluon-config-mode-geo-location-osm',
+  'gluon-web-mesh-vpn-fastd',
+  'gluon-web-private-wifi',
+  'gluon-radv-filterd',
+  'gluon-setup-mode',
+  'gluon-speedtest',
+  'iwinfo',
+  'firewall',
+  'urngd',
+  'gluon-scheduled-domain-switch',
+})
+
+if not device_class('tiny') then
+  features({
+    'wireless-encryption-wpa3',
+  })
+  packages({
+    'ca-bundle',
+    'ca-certificates',
+    'libustream-openssl',
+  })
+end
+
+if target('ramips','mt7621') then
+  packages({
+    '-respondd-module-airtime',
+  })
+end
diff --git a/site.mk b/site.mk
index 4db5b4f..857aa27 100755
--- a/site.mk
+++ b/site.mk
@@ -1,32 +1,3 @@
-GLUON_FEATURES := \
-	autoupdater \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-limit-arp \
-	mesh-batman-adv-15 \
-	mesh-vpn-fastd \
-	respondd \
-	status-page \
-	web-advanced \
-	web-wizard
-
-GLUON_SITE_PACKAGES := \
-	gluon-ssid-changer \
-	respondd-module-airtime \
-	gluon-config-mode-core \
-	gluon-config-mode-domain-select \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-geo-location-osm \
-	gluon-web-mesh-vpn-fastd \
-	gluon-web-private-wifi \
-	gluon-radv-filterd \
-	gluon-setup-mode \
-	gluon-speedtest \
-	iwinfo \
-	firewall \
-	urngd \
-	gluon-scheduled-domain-switch
-
 # Allow overriding the these variables from the command line
 GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
 GLUON_AUTOUPDATER_BRANCH ?= stable
@@ -36,13 +7,3 @@ GLUON_DEPRECATED ?= upgrade
 GLUON_LANGS ?= en de
 GLUON_REGION ?= eu
 GLUON_MULTIDOMAIN=1
-
-
-EXCLUDE_NO_WIFI:= -respondd-module-airtime
-
-# ramips-mt7621
-ifeq ($(GLUON_TARGET),ramips-mt7621)
-	GLUON_ubnt-erx_SITE_PACKAGES +=  $(EXCLUDE_NO_WIFI)
-	GLUON_ubnt-erx-sfp_SITE_PACKAGES +=  $(EXCLUDE_NO_WIFI)
-endif
-