refactor(luci-app-secubox): remove RPCD backend, depend on secubox-core
Resolves package conflict where both luci-app-secubox and secubox-core were providing /usr/libexec/rpcd/luci.secubox. Changes: - Remove RPCD backend (luci.secubox) from luci-app-secubox - Add secubox-core as a dependency - Update Makefile to reflect new architecture - Remove RPCD file references from helper scripts - Update documentation Architecture: - secubox-core (v0.8.0): Provides framework + RPCD backend - luci-app-secubox (v0.7.0): Provides LuCI web UI only 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
b1750bdce3
commit
5afb02c815
@ -8,18 +8,17 @@ PKG_MAINTAINER:=CyberMind <contact@cybermind.fr>
|
|||||||
|
|
||||||
LUCI_TITLE:=LuCI - SecuBox Hub (Central Dashboard)
|
LUCI_TITLE:=LuCI - SecuBox Hub (Central Dashboard)
|
||||||
LUCI_DESCRIPTION:=Central control hub for all SecuBox modules. Provides unified dashboard, module status, system health monitoring, and quick actions.
|
LUCI_DESCRIPTION:=Central control hub for all SecuBox modules. Provides unified dashboard, module status, system health monitoring, and quick actions.
|
||||||
LUCI_DEPENDS:=+luci-base +rpcd +curl +jq
|
LUCI_DEPENDS:=+luci-base +rpcd +curl +jq +secubox-core
|
||||||
LUCI_PKGARCH:=all
|
LUCI_PKGARCH:=all
|
||||||
|
|
||||||
# File permissions (CRITICAL: RPCD scripts MUST be executable 755)
|
# File permissions (CRITICAL: Helper scripts MUST be executable 755)
|
||||||
# Format: path:owner:group:mode
|
# Format: path:owner:group:mode
|
||||||
# - RPCD scripts: 755 (executable by root, required for ubus calls)
|
|
||||||
# - Helper scripts: 755 (if executable)
|
# - Helper scripts: 755 (if executable)
|
||||||
# - Data files: 644 (readable by all - INSTALL_DATA sets this automatically)
|
# - Data files: 644 (readable by all - INSTALL_DATA sets this automatically)
|
||||||
# - Directories: 755 (set automatically by INSTALL_DIR)
|
# - Directories: 755 (set automatically by INSTALL_DIR)
|
||||||
# - CSS/JS files: 644 (set automatically by luci.mk)
|
# - CSS/JS files: 644 (set automatically by luci.mk)
|
||||||
PKG_FILE_MODES:=/usr/libexec/rpcd/luci.secubox:root:root:755 \
|
# Note: RPCD backend is now provided by secubox-core package
|
||||||
/usr/libexec/secubox/fix-permissions.sh:root:root:755
|
PKG_FILE_MODES:=/usr/libexec/secubox/fix-permissions.sh:root:root:755
|
||||||
|
|
||||||
include $(TOPDIR)/feeds/luci/luci.mk
|
include $(TOPDIR)/feeds/luci/luci.mk
|
||||||
|
|
||||||
|
|||||||
@ -170,10 +170,11 @@ luci-app-secubox/
|
|||||||
└── root/
|
└── root/
|
||||||
├── etc/config/secubox # UCI configuration
|
├── etc/config/secubox # UCI configuration
|
||||||
└── usr/
|
└── usr/
|
||||||
├── libexec/rpcd/secubox # RPCD backend
|
|
||||||
└── share/
|
└── share/
|
||||||
├── luci/menu.d/luci-app-secubox.json
|
├── luci/menu.d/luci-app-secubox.json
|
||||||
└── rpcd/acl.d/luci-app-secubox.json
|
└── rpcd/acl.d/luci-app-secubox.json
|
||||||
|
|
||||||
|
# Note: RPCD backend (luci.secubox) is provided by secubox-core package
|
||||||
```
|
```
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|||||||
@ -3,8 +3,7 @@
|
|||||||
# SecuBox UCI Defaults
|
# SecuBox UCI Defaults
|
||||||
# Copyright (C) 2025 CyberMind.fr
|
# Copyright (C) 2025 CyberMind.fr
|
||||||
|
|
||||||
# Set proper permissions
|
# Note: RPCD backend is now provided by secubox-core package
|
||||||
chmod +x /usr/libexec/rpcd/secubox 2>/dev/null || true
|
|
||||||
|
|
||||||
# Reload rpcd to register new methods
|
# Reload rpcd to register new methods
|
||||||
/etc/init.d/rpcd reload 2>/dev/null || true
|
/etc/init.d/rpcd reload 2>/dev/null || true
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -21,8 +21,8 @@ log_error() {
|
|||||||
fix_rpcd_permissions() {
|
fix_rpcd_permissions() {
|
||||||
log_info "Fixing RPCD script permissions..."
|
log_info "Fixing RPCD script permissions..."
|
||||||
|
|
||||||
|
# Note: luci.secubox backend is now provided by secubox-core package
|
||||||
local rpcd_scripts="
|
local rpcd_scripts="
|
||||||
/usr/libexec/rpcd/luci.secubox
|
|
||||||
/usr/libexec/rpcd/luci.system-hub
|
/usr/libexec/rpcd/luci.system-hub
|
||||||
/usr/libexec/rpcd/luci.network-modes
|
/usr/libexec/rpcd/luci.network-modes
|
||||||
/usr/libexec/rpcd/luci.crowdsec-dashboard
|
/usr/libexec/rpcd/luci.crowdsec-dashboard
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user