diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-10-14 09:41:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-14 09:41:57 +0200 |
| commit | 3b202fa469f58b35d1ce2e1cb91015f9551618c8 (patch) | |
| tree | 10a308de02fdcc77a3dc01820b5723a105fe9daa /data | |
| parent | 688bde775690a2f3c6d6038b122d14c3d9efa95c (diff) | |
| parent | 6cb00c9a7eb7de811e4a5f13d608062fb8e3b5e7 (diff) | |
| download | vyos-1x-3b202fa469f58b35d1ce2e1cb91015f9551618c8.tar.gz vyos-1x-3b202fa469f58b35d1ce2e1cb91015f9551618c8.zip | |
Merge pull request #2364 from vyos/mergify/bp/sagitta/pr-2361
pmacct: T5232: Fixed pmacct service control via systemctl (backport #2361)
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/pmacct/override.conf.j2 | 4 | ||||
| -rw-r--r-- | data/templates/pmacct/uacctd.conf.j2 | 2 |
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 }} |