bundles/nftables: workaround does not work for debian buster

2022-03-13 14:13:59 +01:00 · 2022-03-13 14:13:59 +01:00 · 212ba72b30
parent aa3ce32a7c
commit 212ba72b30
2 changed files with 3 additions and 0 deletions
--- 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
--- 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',