summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-10-14 08:56:44 +0200
committerGitHub <noreply@github.com>2023-10-14 08:56:44 +0200
commit656f9ccad10e61a03f1c206f8596f800e63d9738 (patch)
tree69a5648fbf212972e82c308ff8ed906dbe8d2c11 /data/templates
parentc4bea386c66259f642f4695f376b4c544903bc7e (diff)
parente364e9813b6833f6b108e7177ef7ea2d9e7bac33 (diff)
downloadvyos-1x-656f9ccad10e61a03f1c206f8596f800e63d9738.tar.gz
vyos-1x-656f9ccad10e61a03f1c206f8596f800e63d9738.zip
Merge pull request #2361 from zdc/T5232-circinus
pmacct: T5232: Fixed pmacct service control via systemctl
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/pmacct/override.conf.j24
-rw-r--r--data/templates/pmacct/uacctd.conf.j22
2 files changed, 3 insertions, 3 deletions
diff --git a/data/templates/pmacct/override.conf.j2 b/data/templates/pmacct/override.conf.j2
index 213569ddc..44a100bb6 100644
--- a/data/templates/pmacct/override.conf.j2
+++ b/data/templates/pmacct/override.conf.j2
@@ -9,9 +9,9 @@ ConditionPathExists=/run/pmacct/uacctd.conf
EnvironmentFile=
ExecStart=
ExecStart={{ vrf_command }}/usr/sbin/uacctd -f /run/pmacct/uacctd.conf
+ExecStop=/usr/libexec/vyos/system/uacctd_stop.py $MAINPID 60
WorkingDirectory=
WorkingDirectory=/run/pmacct
-PIDFile=
-PIDFile=/run/pmacct/uacctd.pid
Restart=always
RestartSec=10
+KillMode=mixed
diff --git a/data/templates/pmacct/uacctd.conf.j2 b/data/templates/pmacct/uacctd.conf.j2
index 1370f8121..aae0a0619 100644
--- a/data/templates/pmacct/uacctd.conf.j2
+++ b/data/templates/pmacct/uacctd.conf.j2
@@ -1,7 +1,7 @@
# Genereated from VyOS configuration
daemonize: true
promisc: false
-pidfile: /run/pmacct/uacctd.pid
+syslog: daemon
uacctd_group: 2
uacctd_nl_size: 2097152
snaplen: {{ packet_length }}