From fa437ddaf10616c1c2f68d582a8b8d4c74c59d96 Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Tue, 17 Jun 2025 00:37:15 +0200 Subject: [PATCH] Simplify service file, no longer require permissions on /run/vpp, and set optimal perms on agentx --- debian/postinst | 5 ----- debian/rules | 1 + govpp-snmp-agentx.service | 5 +---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/debian/postinst b/debian/postinst index e67fdc2..f5e7e37 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,11 +4,6 @@ set -e case "$1" in configure) - # Create agentx directories - mkdir -p /var/agentx/master - chown Debian-snmp:vpp /var/agentx /var/agentx/master - chmod 770 /var/agentx /var/agentx/master - # Enable and start the service systemctl daemon-reload systemctl enable govpp-snmp-agentx.service diff --git a/debian/rules b/debian/rules index 7849447..dd48f25 100755 --- a/debian/rules +++ b/debian/rules @@ -25,4 +25,5 @@ override_dh_auto_test: override_dh_auto_clean: rm -f govpp-snmp-agentx + [ -d debian/go ] && chmod -R +w debian/go || true rm -rf debian/.gocache debian/go obj-* \ No newline at end of file diff --git a/govpp-snmp-agentx.service b/govpp-snmp-agentx.service index 582087a..0d42404 100644 --- a/govpp-snmp-agentx.service +++ b/govpp-snmp-agentx.service @@ -1,14 +1,11 @@ [Unit] Description=GoVPP SNMP AgentX Daemon After=network.target vpp.service -Requires=netns-dataplane.service [Service] Type=simple -ExecStartPre=-+/usr/bin/chmod 660 /run/vpp/stats.sock /run/vpp/api.sock /run/vpp/cli.sock -ExecStartPre=-+/usr/bin/chown :vpp /run/vpp/stats.sock /run/vpp/api.sock /run/vpp/cli.sock ExecStartPre=-+/usr/bin/chmod 770 /var/agentx /var/agentx/master -ExecStartPre=-+/usr/bin/chown :vpp /var/agentx /var/agentx/master +ExecStartPre=-+/usr/bin/chown Debian-snmp:vpp /var/agentx /var/agentx/master ExecStart=/usr/sbin/govpp-snmp-agentx -agentx.addr /var/agentx/master -vppcfg /etc/vpp/vppcfg.yaml -vppstats.period 10 User=Debian-snmp Group=vpp