diff --git a/package/secubox/luci-app-network-tweaks/Makefile b/package/secubox/luci-app-network-tweaks/Makefile index 4a4a3f95..e2e91269 100644 --- a/package/secubox/luci-app-network-tweaks/Makefile +++ b/package/secubox/luci-app-network-tweaks/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-network-tweaks PKG_VERSION:=1.0.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_ARCH:=all PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=CyberMind diff --git a/package/secubox/luci-app-network-tweaks/htdocs/luci-static/resources/view/network-tweaks/overview.js b/package/secubox/luci-app-network-tweaks/htdocs/luci-static/resources/view/network-tweaks/overview.js index f4fc2550..89b0b9fb 100644 --- a/package/secubox/luci-app-network-tweaks/htdocs/luci-static/resources/view/network-tweaks/overview.js +++ b/package/secubox/luci-app-network-tweaks/htdocs/luci-static/resources/view/network-tweaks/overview.js @@ -285,11 +285,15 @@ return view.extend({ _('Install via adguardhomectl')) ]), E('div', { 'class': 'proxy-actions', 'style': 'display: flex; gap: 0.5rem;' }, [ - E('button', { - 'class': 'btn cbi-button', - 'click': L.bind(this.handleAdGuardToggle, this), - 'disabled': !adguard.installed - }, adguard.enabled ? _('Disable') : _('Enable')), + adguard.installed ? + E('button', { + 'class': 'btn cbi-button', + 'click': L.bind(this.handleAdGuardToggle, this) + }, adguard.enabled ? _('Disable') : _('Enable')) : + E('button', { + 'class': 'btn cbi-button', + 'disabled': 'disabled' + }, _('Not Installed')), adguard.running ? E('a', { 'class': 'btn cbi-button', 'href': 'http://' + window.location.hostname + ':' + (adguard.port || 3000), @@ -314,18 +318,23 @@ return view.extend({ E('div', {}, cdnListeningText), E('div', {}, cdnCache.installed ? _('nginx proxy installed') : _('Not installed')) ]), - E('div', { 'class': 'proxy-actions', 'style': 'display: flex; gap: 0.5rem;' }, [ + E('div', { 'class': 'proxy-actions', 'style': 'display: flex; gap: 0.5rem;' }, + cdnCache.installed ? [ E('button', { 'class': 'btn cbi-button', - 'click': L.bind(this.handleCdnCacheToggle, this), - 'disabled': !cdnCache.installed + 'click': L.bind(this.handleCdnCacheToggle, this) }, cdnCache.enabled ? _('Disable') : _('Enable')), E('button', { 'class': 'btn cbi-button', - 'click': L.bind(this.handleCdnCacheRestart, this), - 'disabled': !cdnCache.installed + 'click': L.bind(this.handleCdnCacheRestart, this) }, _('Restart')) - ]) + ] : [ + E('button', { + 'class': 'btn cbi-button', + 'disabled': 'disabled' + }, _('Not Installed')) + ] + ) ]), // WPAD Card E('div', { 'class': 'proxy-card', 'style': 'background: #16213e; border-radius: 8px; padding: 1rem; border: 1px solid #333;' }, [ diff --git a/package/secubox/luci-app-tor-shield/Makefile b/package/secubox/luci-app-tor-shield/Makefile index 8dd23dfb..32950f5d 100644 --- a/package/secubox/luci-app-tor-shield/Makefile +++ b/package/secubox/luci-app-tor-shield/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-tor-shield PKG_VERSION:=1.0.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_ARCH:=all PKG_LICENSE:=MIT diff --git a/package/secubox/luci-app-tor-shield/htdocs/luci-static/resources/view/tor-shield/overview.js b/package/secubox/luci-app-tor-shield/htdocs/luci-static/resources/view/tor-shield/overview.js index aa1b4831..1f80a662 100644 --- a/package/secubox/luci-app-tor-shield/htdocs/luci-static/resources/view/tor-shield/overview.js +++ b/package/secubox/luci-app-tor-shield/htdocs/luci-static/resources/view/tor-shield/overview.js @@ -601,6 +601,14 @@ return view.extend({ }, [ E('span', { 'style': 'font-size: 24px; margin-bottom: 4px;' }, '\u{2699}\uFE0F'), E('span', {}, _('Settings')) + ]), + E('a', { + 'class': 'tor-btn', + 'style': 'display: flex; flex-direction: column; align-items: center; padding: 16px; border-radius: 12px; text-decoration: none; background: linear-gradient(135deg, #0891b2 0%, #06b6d4 100%);', + 'href': L.url('admin', 'services', 'network-tweaks') + }, [ + E('span', { 'style': 'font-size: 24px; margin-bottom: 4px;' }, '\u{1F310}'), + E('span', {}, _('DNS & Proxy')) ]) ]) ]) diff --git a/package/secubox/secubox-app-adguardhome/files/etc/config/adguardhome b/package/secubox/secubox-app-adguardhome/files/etc/config/adguardhome index c52427da..32e8c9a1 100644 --- a/package/secubox/secubox-app-adguardhome/files/etc/config/adguardhome +++ b/package/secubox/secubox-app-adguardhome/files/etc/config/adguardhome @@ -3,6 +3,6 @@ config adguardhome 'main' option image 'adguard/adguardhome:latest' option work_path '/srv/adguardhome/work' option conf_path '/srv/adguardhome/conf' - option port '3000' - option dns_port '53' + option port '3003' + option dns_port '5353' option timezone 'UTC'