fix(apply): restart target firewall with strategy
Co-authored-by: GPT-6 <gpt-6@openai.com>
This commit is contained in:
1 parent
cdeb67f0dd
commit
0b4b909a20
6 files changed
+91
-15
No files matched your search
@@ -21,7 +21,7 @@ const managedMarkerName = ".autotune-target.json"
|
||||
const managedTargetID = "zapret-autotune-managed-v1"
|
||||
const managedTargetDirectory = "/var/lib/zapret-autotune/target"
|
||||
const managedTargetConfig = managedTargetDirectory + "/config"
|
||||
const managedBaseline = "# Autotuner-owned disabled baseline\nNFQWS2_ENABLE=0\nINIT_APPLY_FW=0\nNFQWS2_OPT=''\n"
|
||||
const managedBaseline = "# Autotuner-owned disabled baseline\nNFQWS2_ENABLE=0\n" + managedFirewallConfig + "NFQWS2_OPT=''\n"
|
||||
|
||||
type managedIdentity struct {
|
||||
Role, Directory, ID string
|
||||
@@ -47,7 +47,7 @@ func managedDependencies(player playerRunner) managedDeps {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||
defer cancel()
|
||||
if err := exec.CommandContext(ctx, path, args...).Run(); err != nil {
|
||||
return fmt.Errorf("daemon-only reload failed")
|
||||
return fmt.Errorf("target-local firewall/daemon restart failed: %w", err)
|
||||
}
|
||||
return nil
|
||||
},
|
||||
@@ -263,7 +263,7 @@ func managedCLI(args []string, stdout, stderr io.Writer, d managedDeps) int {
|
||||
fmt.Fprintln(stderr, "error:", err)
|
||||
return 1
|
||||
}
|
||||
m := &managedTransaction{Dir: dir, Name: "config", Reload: func() error { return d.run(d.script, "restart-daemons") }, Health: func() (string, error) { return "", fmt.Errorf("health not configured") }}
|
||||
m := &managedTransaction{Dir: dir, Name: "config", Reload: func() error { return d.run(d.script, "restart") }, Health: func() (string, error) { return "", fmt.Errorf("health not configured") }}
|
||||
if command == "init" {
|
||||
err = managedInitialize(m)
|
||||
} else if err = managedCheckIdentity(m); err == nil {
|
||||
|
||||
Reference in new issue
Block a user