From 212ba72b303c1d905a1af20a7ba1c08f2bd0d205 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 13 Mar 2022 14:13:59 +0100 Subject: [PATCH] bundles/nftables: workaround does not work for debian buster --- bundles/nftables/files/override.conf | 2 ++ bundles/nftables/items.py | 1 + 2 files changed, 3 insertions(+) diff --git a/bundles/nftables/files/override.conf b/bundles/nftables/files/override.conf index 8d2bb0f..4fb4bb6 100644 --- a/bundles/nftables/files/override.conf +++ b/bundles/nftables/files/override.conf @@ -9,5 +9,7 @@ ExecReload= ExecReload=/usr/sbin/nft -f /etc/nftables.conf ExecReload=/usr/local/sbin/apply-sysctl +% if node.os != 'debian' or node.os_version[0] > 10: Restart=on-failure RestartSec=2 +% endif diff --git a/bundles/nftables/items.py b/bundles/nftables/items.py index 8975d45..42bf2e4 100644 --- a/bundles/nftables/items.py +++ b/bundles/nftables/items.py @@ -24,6 +24,7 @@ files = { }, '/etc/systemd/system/nftables.service.d/bundlewrap.conf': { 'source': 'override.conf', + 'content_type': 'mako', 'triggers': { 'action:systemd-reload', 'svc_systemd:nftables:reload',