fix(postinst): nftables auch beim Upgrade reloaden
Vorher: render-config --no-reload schrieb nur die Files; haproxy wurde explizit per systemctl restart unten neu gefahren, aber nft-Set blieb beim Kernel-Stand vom letzten Boot. Bug sichtbar bei 1.0.13: Anti-Lockout-Eintrag für 3443 war im Template, aber der Kernel hatte die Regel nicht — Port von außen blockiert. Fix: zwei render-Calls — haproxy mit --no-reload (wie bisher), nftables ohne, damit `sudo nft -f` direkt nach dem Schreiben ausgeführt wird. Version 1.0.14. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -39,7 +39,7 @@ import (
|
|||||||
wgsvc "git.netcell-it.de/projekte/edgeguard-native/internal/services/wireguard"
|
wgsvc "git.netcell-it.de/projekte/edgeguard-native/internal/services/wireguard"
|
||||||
)
|
)
|
||||||
|
|
||||||
var version = "1.0.13"
|
var version = "1.0.14"
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
addr := os.Getenv("EDGEGUARD_API_ADDR")
|
addr := os.Getenv("EDGEGUARD_API_ADDR")
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
var version = "1.0.13"
|
var version = "1.0.14"
|
||||||
|
|
||||||
const usage = `edgeguard-ctl — EdgeGuard CLI
|
const usage = `edgeguard-ctl — EdgeGuard CLI
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
var version = "1.0.13"
|
var version = "1.0.14"
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
log.Printf("edgeguard-scheduler %s starting", version)
|
log.Printf("edgeguard-scheduler %s starting", version)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "edgeguard-management-ui",
|
"name": "edgeguard-management-ui",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.13",
|
"version": "1.0.14",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ const NAV: NavSection[] = [
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
const VERSION = '1.0.13'
|
const VERSION = '1.0.14'
|
||||||
|
|
||||||
export default function Sidebar({ isOpen, onClose }: SidebarProps) {
|
export default function Sidebar({ isOpen, onClose }: SidebarProps) {
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
|
|||||||
@@ -98,10 +98,17 @@ SUDOERS
|
|||||||
# ── Render initial service configs ───────────────────────────
|
# ── Render initial service configs ───────────────────────────
|
||||||
# Writes /etc/edgeguard/haproxy/haproxy.cfg + nftables.d/
|
# Writes /etc/edgeguard/haproxy/haproxy.cfg + nftables.d/
|
||||||
# ruleset.nft from the (just-migrated, empty) PG state.
|
# ruleset.nft from the (just-migrated, empty) PG state.
|
||||||
# --no-reload because haproxy isn't pointed at our config yet
|
#
|
||||||
# — the drop-in below does that, then we restart.
|
# haproxy bekommt --no-reload (drop-in unten zeigt erst danach
|
||||||
if ! sudo -n -u "$EG_USER" /usr/bin/edgeguard-ctl render-config --no-reload; then
|
# auf unsere cfg; wir restarten explizit); nftables muss aber
|
||||||
echo "postinst: edgeguard-ctl render-config failed — aborting" >&2
|
# aktiv reloadet werden, sonst läuft das Kernel-Set bei Template-
|
||||||
|
# Änderungen (z.B. neue anti-lockout-Ports) hinterher.
|
||||||
|
if ! sudo -n -u "$EG_USER" /usr/bin/edgeguard-ctl render-config --only=haproxy --no-reload; then
|
||||||
|
echo "postinst: edgeguard-ctl render-config (haproxy) failed — aborting" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if ! sudo -n -u "$EG_USER" /usr/bin/edgeguard-ctl render-config --only=nftables; then
|
||||||
|
echo "postinst: edgeguard-ctl render-config (nftables) failed — aborting" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user