diff --git a/luci-app-secubox/Makefile b/luci-app-secubox/Makefile index 1dc0e336..858d2638 100644 --- a/luci-app-secubox/Makefile +++ b/luci-app-secubox/Makefile @@ -11,14 +11,12 @@ LUCI_DESCRIPTION:=Central control hub for all SecuBox modules. Provides unified LUCI_DEPENDS:=+luci-base +rpcd +curl +jq +secubox-core LUCI_PKGARCH:=all -# File permissions (CRITICAL: Helper scripts MUST be executable 755) -# Format: path:owner:group:mode -# - Helper scripts: 755 (if executable) +# File permissions +# - Helper scripts: 755 (set in source root/ directory) # - Data files: 644 (readable by all - INSTALL_DATA sets this automatically) # - Directories: 755 (set automatically by INSTALL_DIR) # - CSS/JS files: 644 (set automatically by luci.mk) # Note: RPCD backend is now provided by secubox-core package -PKG_FILE_MODES:=/usr/libexec/secubox/fix-permissions.sh:root:root:755 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-secubox/root/usr/libexec/secubox/fix-permissions.sh b/luci-app-secubox/root/usr/libexec/secubox/fix-permissions.sh old mode 100644 new mode 100755 diff --git a/package/secubox/luci-app-auth-guardian/Makefile b/package/secubox/luci-app-auth-guardian/Makefile index 274c3287..207a0102 100644 --- a/package/secubox/luci-app-auth-guardian/Makefile +++ b/package/secubox/luci-app-auth-guardian/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-auth-guardian PKG_VERSION:=0.4.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=MIT PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-bandwidth-manager/Makefile b/package/secubox/luci-app-bandwidth-manager/Makefile index e38588e7..4d28c65d 100644 --- a/package/secubox/luci-app-bandwidth-manager/Makefile +++ b/package/secubox/luci-app-bandwidth-manager/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-bandwidth-manager PKG_VERSION:=0.4.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-cdn-cache/Makefile b/package/secubox/luci-app-cdn-cache/Makefile index 676768d9..eb51e94a 100644 --- a/package/secubox/luci-app-cdn-cache/Makefile +++ b/package/secubox/luci-app-cdn-cache/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-cdn-cache PKG_VERSION:=0.5.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-client-guardian/Makefile b/package/secubox/luci-app-client-guardian/Makefile index ee7c791d..56d9adef 100644 --- a/package/secubox/luci-app-client-guardian/Makefile +++ b/package/secubox/luci-app-client-guardian/Makefile @@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-client-guardian PKG_VERSION:=0.4.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-crowdsec-dashboard/Makefile b/package/secubox/luci-app-crowdsec-dashboard/Makefile index a42b7aae..ca9a9401 100644 --- a/package/secubox/luci-app-crowdsec-dashboard/Makefile +++ b/package/secubox/luci-app-crowdsec-dashboard/Makefile @@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-crowdsec-dashboard PKG_VERSION:=0.5.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-ksm-manager/Makefile b/package/secubox/luci-app-ksm-manager/Makefile index 207844e2..07f2f228 100644 --- a/package/secubox/luci-app-ksm-manager/Makefile +++ b/package/secubox/luci-app-ksm-manager/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ksm-manager PKG_VERSION:=0.4.0 PKG_RELEASE:=1 +PKG_ARCH:=all LUCI_TITLE:=LuCI support for Key Storage Manager LUCI_DEPENDS:=+luci-base +rpcd +libubus +libubox +openssl-util +gnupg2 +nitropy +yubikey-manager +opensc +libccid +pcscd +kmod-usb-core +kmod-usb2 +kmod-usb3 diff --git a/package/secubox/luci-app-magicmirror/Makefile b/package/secubox/luci-app-magicmirror/Makefile index 7bc957d8..6a449c82 100644 --- a/package/secubox/luci-app-magicmirror/Makefile +++ b/package/secubox/luci-app-magicmirror/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-magicmirror PKG_VERSION:=1.0.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-media-flow/Makefile b/package/secubox/luci-app-media-flow/Makefile index cea0c981..9f2d3382 100644 --- a/package/secubox/luci-app-media-flow/Makefile +++ b/package/secubox/luci-app-media-flow/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-media-flow PKG_VERSION:=0.4.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-mqtt-bridge/Makefile b/package/secubox/luci-app-mqtt-bridge/Makefile index 1fc3ea03..531ed085 100644 --- a/package/secubox/luci-app-mqtt-bridge/Makefile +++ b/package/secubox/luci-app-mqtt-bridge/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-mqtt-bridge PKG_VERSION:=0.4.0 PKG_RELEASE:=2 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-netdata-dashboard/Makefile b/package/secubox/luci-app-netdata-dashboard/Makefile index 9f87214a..1ef72eb8 100644 --- a/package/secubox/luci-app-netdata-dashboard/Makefile +++ b/package/secubox/luci-app-netdata-dashboard/Makefile @@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-netdata-dashboard PKG_VERSION:=0.5.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-netifyd-dashboard/Makefile b/package/secubox/luci-app-netifyd-dashboard/Makefile index 3fe6032b..757f0054 100644 --- a/package/secubox/luci-app-netifyd-dashboard/Makefile +++ b/package/secubox/luci-app-netifyd-dashboard/Makefile @@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-netifyd-dashboard PKG_VERSION:=0.4.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-network-modes/Makefile b/package/secubox/luci-app-network-modes/Makefile index 634c0042..0d2a824e 100644 --- a/package/secubox/luci-app-network-modes/Makefile +++ b/package/secubox/luci-app-network-modes/Makefile @@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-network-modes PKG_VERSION:=0.5.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-network-tweaks/Makefile b/package/secubox/luci-app-network-tweaks/Makefile index 1804b79b..0a0fd66f 100644 --- a/package/secubox/luci-app-network-tweaks/Makefile +++ b/package/secubox/luci-app-network-tweaks/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-network-tweaks PKG_VERSION:=1.0.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-network-tweaks/files/etc/config/network_tweaks b/package/secubox/luci-app-network-tweaks/root/etc/config/network_tweaks similarity index 100% rename from package/secubox/luci-app-network-tweaks/files/etc/config/network_tweaks rename to package/secubox/luci-app-network-tweaks/root/etc/config/network_tweaks diff --git a/package/secubox/luci-app-network-tweaks/files/etc/hotplug.d/iface/99-network-tweaks b/package/secubox/luci-app-network-tweaks/root/etc/hotplug.d/iface/99-network-tweaks old mode 100644 new mode 100755 similarity index 100% rename from package/secubox/luci-app-network-tweaks/files/etc/hotplug.d/iface/99-network-tweaks rename to package/secubox/luci-app-network-tweaks/root/etc/hotplug.d/iface/99-network-tweaks diff --git a/package/secubox/luci-app-network-tweaks/files/etc/init.d/network-tweaks b/package/secubox/luci-app-network-tweaks/root/etc/init.d/network-tweaks old mode 100644 new mode 100755 similarity index 100% rename from package/secubox/luci-app-network-tweaks/files/etc/init.d/network-tweaks rename to package/secubox/luci-app-network-tweaks/root/etc/init.d/network-tweaks diff --git a/package/secubox/luci-app-network-tweaks/files/usr/libexec/rpcd/luci.network-tweaks b/package/secubox/luci-app-network-tweaks/root/usr/libexec/rpcd/luci.network-tweaks old mode 100644 new mode 100755 similarity index 100% rename from package/secubox/luci-app-network-tweaks/files/usr/libexec/rpcd/luci.network-tweaks rename to package/secubox/luci-app-network-tweaks/root/usr/libexec/rpcd/luci.network-tweaks diff --git a/package/secubox/luci-app-network-tweaks/files/usr/sbin/network-tweaks-sync b/package/secubox/luci-app-network-tweaks/root/usr/sbin/network-tweaks-sync old mode 100644 new mode 100755 similarity index 100% rename from package/secubox/luci-app-network-tweaks/files/usr/sbin/network-tweaks-sync rename to package/secubox/luci-app-network-tweaks/root/usr/sbin/network-tweaks-sync diff --git a/package/secubox/luci-app-secubox-bonus/Makefile b/package/secubox/luci-app-secubox-bonus/Makefile index e87f5c1d..15e01ba3 100644 --- a/package/secubox/luci-app-secubox-bonus/Makefile +++ b/package/secubox/luci-app-secubox-bonus/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-secubox-bonus PKG_VERSION:=0.1.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-system-hub/Makefile b/package/secubox/luci-app-system-hub/Makefile index 54897848..fca02dcb 100644 --- a/package/secubox/luci-app-system-hub/Makefile +++ b/package/secubox/luci-app-system-hub/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-system-hub PKG_VERSION:=0.5.1 PKG_RELEASE:=3 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-traffic-shaper/Makefile b/package/secubox/luci-app-traffic-shaper/Makefile index b9facba7..61ef0d22 100644 --- a/package/secubox/luci-app-traffic-shaper/Makefile +++ b/package/secubox/luci-app-traffic-shaper/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-traffic-shaper PKG_VERSION:=0.4.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-vhost-manager/Makefile b/package/secubox/luci-app-vhost-manager/Makefile index 9cc1b59e..40b50d18 100644 --- a/package/secubox/luci-app-vhost-manager/Makefile +++ b/package/secubox/luci-app-vhost-manager/Makefile @@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-vhost-manager PKG_VERSION:=0.5.0 PKG_RELEASE:=4 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-wireguard-dashboard/Makefile b/package/secubox/luci-app-wireguard-dashboard/Makefile index d3d9a561..20de1411 100644 --- a/package/secubox/luci-app-wireguard-dashboard/Makefile +++ b/package/secubox/luci-app-wireguard-dashboard/Makefile @@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-wireguard-dashboard PKG_VERSION:=0.4.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-zigbee2mqtt/Makefile b/package/secubox/luci-app-zigbee2mqtt/Makefile index 5033b877..400479bf 100644 --- a/package/secubox/luci-app-zigbee2mqtt/Makefile +++ b/package/secubox/luci-app-zigbee2mqtt/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-zigbee2mqtt PKG_VERSION:=1.0.0 PKG_RELEASE:=1 +PKG_ARCH:=all LUCI_TITLE:=LuCI Support for SecuBox Zigbee2MQTT App LUCI_DESCRIPTION:=Graphical interface for managing the Zigbee2MQTT docker application. diff --git a/package/secubox/secubox-app-adguardhome/Makefile b/package/secubox/secubox-app-adguardhome/Makefile index 84a95e52..112e7f75 100644 --- a/package/secubox/secubox-app-adguardhome/Makefile +++ b/package/secubox/secubox-app-adguardhome/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=secubox-app-adguardhome PKG_RELEASE:=1 PKG_VERSION:=1.0.0 +PKG_ARCH:=all PKG_MAINTAINER:=CyberMind Studio PKG_LICENSE:=Apache-2.0 diff --git a/package/secubox/secubox-app-crowdsec/Makefile b/package/secubox/secubox-app-crowdsec/Makefile index 3269f20a..7fa4c804 100644 --- a/package/secubox/secubox-app-crowdsec/Makefile +++ b/package/secubox/secubox-app-crowdsec/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crowdsec PKG_VERSION:=1.7.4 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/crowdsec/tar.gz/v$(PKG_VERSION)? diff --git a/package/secubox/secubox-app-domoticz/Makefile b/package/secubox/secubox-app-domoticz/Makefile index 17376208..2aeeeb35 100644 --- a/package/secubox/secubox-app-domoticz/Makefile +++ b/package/secubox/secubox-app-domoticz/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=secubox-app-domoticz PKG_RELEASE:=1 PKG_VERSION:=1.0.0 +PKG_ARCH:=all PKG_MAINTAINER:=CyberMind Studio PKG_LICENSE:=Apache-2.0 diff --git a/package/secubox/secubox-app-lyrion/Makefile b/package/secubox/secubox-app-lyrion/Makefile index 929f1c31..d434f6f8 100644 --- a/package/secubox/secubox-app-lyrion/Makefile +++ b/package/secubox/secubox-app-lyrion/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=secubox-app-lyrion PKG_RELEASE:=1 PKG_VERSION:=1.0.0 +PKG_ARCH:=all PKG_MAINTAINER:=CyberMind Studio PKG_LICENSE:=Apache-2.0 diff --git a/package/secubox/secubox-app-magicmirror/Makefile b/package/secubox/secubox-app-magicmirror/Makefile index f84b0743..31e7a16d 100644 --- a/package/secubox/secubox-app-magicmirror/Makefile +++ b/package/secubox/secubox-app-magicmirror/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=secubox-app-magicmirror PKG_RELEASE:=1 PKG_VERSION:=1.0.0 +PKG_ARCH:=all PKG_MAINTAINER:=CyberMind Studio PKG_LICENSE:=Apache-2.0 diff --git a/package/secubox/secubox-app-nextcloud/Makefile b/package/secubox/secubox-app-nextcloud/Makefile index 87add691..1b92364e 100644 --- a/package/secubox/secubox-app-nextcloud/Makefile +++ b/package/secubox/secubox-app-nextcloud/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=secubox-app-nextcloud PKG_RELEASE:=1 PKG_VERSION:=1.0.0 +PKG_ARCH:=all PKG_MAINTAINER:=CyberMind Studio PKG_LICENSE:=Apache-2.0 diff --git a/package/secubox/secubox-app-nodogsplash/Makefile b/package/secubox/secubox-app-nodogsplash/Makefile index 9d2aa9a1..bb4d2cf2 100644 --- a/package/secubox/secubox-app-nodogsplash/Makefile +++ b/package/secubox/secubox-app-nodogsplash/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=secubox-app-nodogsplash PKG_VERSION:=5.0.2 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_SOURCE:=nodogsplash-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/nodogsplash/nodogsplash/archive/refs/tags diff --git a/package/secubox/secubox-app-zigbee2mqtt/Makefile b/package/secubox/secubox-app-zigbee2mqtt/Makefile index 3b269c5c..e473fb8f 100644 --- a/package/secubox/secubox-app-zigbee2mqtt/Makefile +++ b/package/secubox/secubox-app-zigbee2mqtt/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=secubox-app-zigbee2mqtt PKG_RELEASE:=2 PKG_VERSION:=1.0.0 +PKG_ARCH:=all PKG_MAINTAINER:=CyberMind Studio PKG_LICENSE:=Apache-2.0 diff --git a/package/secubox/secubox-app/Makefile b/package/secubox/secubox-app/Makefile index 7c3afdd1..d1da6b8f 100644 --- a/package/secubox/secubox-app/Makefile +++ b/package/secubox/secubox-app/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=secubox-app PKG_VERSION:=1.0.0 PKG_RELEASE:=1 +PKG_ARCH:=all PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/package/secubox/secubox-core/Makefile b/package/secubox/secubox-core/Makefile index c0dea489..ec8a5a78 100644 --- a/package/secubox/secubox-core/Makefile +++ b/package/secubox/secubox-core/Makefile @@ -7,6 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=secubox-core PKG_VERSION:=0.8.0 PKG_RELEASE:=3 +PKG_ARCH:=all PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=SecuBox Team @@ -83,9 +84,6 @@ define Package/secubox-core/install # Install individual module catalog files -$(INSTALL_DATA) ./root/usr/share/secubox/plugins/catalog/*.json $(1)/usr/share/secubox/plugins/catalog/ 2>/dev/null || true - - $(INSTALL_DIR) $(1)/var/run/secubox - $(INSTALL_DIR) $(1)/var/log/secubox endef define Package/secubox-core/postinst diff --git a/package/secubox/secubox-core/root/usr/libexec/rpcd/luci.secubox b/package/secubox/secubox-core/root/usr/libexec/rpcd/luci.secubox index 80e8c427..3c2ce335 100755 --- a/package/secubox/secubox-core/root/usr/libexec/rpcd/luci.secubox +++ b/package/secubox/secubox-core/root/usr/libexec/rpcd/luci.secubox @@ -89,6 +89,9 @@ case "$1" in json_add_object "get_appstore_apps" json_close_object + json_add_object "list_apps" + json_close_object + json_add_object "get_appstore_app" json_add_string "app_id" "string" json_close_object @@ -358,6 +361,16 @@ case "$1" in fi ;; + list_apps) + # Alias for get_appstore_apps - returns apps from main catalog + CATALOG_FILE="/usr/share/secubox/catalog.json" + if [ -f "$CATALOG_FILE" ]; then + jq '{apps: .plugins, categories: .categories}' "$CATALOG_FILE" + else + echo '{"apps":[],"categories":{}}' + fi + ;; + get_appstore_app) # Get single app details from catalog read -r input