From 07d002e3be03babf1c3faaee43a90fe513969134 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 26 Jan 2020 11:54:07 +0100
Subject: snmpd: T1937: fix all startup warnings

This is actually an "upstream" bug, see [1] but it can be fixed via our own
scripts.

[1]: https://bugs.launchpad.net/ubuntu/+source/net-snmp/+bug/1384122
---
 src/conf_mode/snmp.py                              | 22 ----------------------
 .../systemd/system/snmpd.service.d/override.conf   |  6 ++++++
 2 files changed, 6 insertions(+), 22 deletions(-)
 create mode 100644 src/etc/systemd/system/snmpd.service.d/override.conf

(limited to 'src')

diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py
index db850b329..eea907705 100755
--- a/src/conf_mode/snmp.py
+++ b/src/conf_mode/snmp.py
@@ -35,7 +35,6 @@ config_file_client  = r'/etc/snmp/snmp.conf'
 config_file_daemon  = r'/etc/snmp/snmpd.conf'
 config_file_access  = r'/usr/share/snmp/snmpd.conf'
 config_file_user    = r'/var/lib/snmp/snmpd.conf'
-config_file_systemd = r'/etc/systemd/system/snmpd.service.d/override.conf'
 default_script_dir  = r'/config/user-data/'
 
 # SNMP OIDs used to mark auth/priv type
@@ -208,17 +207,6 @@ extend {{ ext.name }} {{ ext.script }}
 {% endif %}
 """
 
-# SNMP template (/etc/default/snmpd) - be careful if you edit the template.
-init_config_tmpl = """
-### Autogenerated by snmp.py ###
-# This file controls the activity of snmpd
-
-[Service]
-ExecStart=
-ExecStart=/usr/sbin/snmpd -LS0-5d -Lf /dev/null -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ipCidrRouteTable,inetCidrRouteTable -f -p /run/snmpd.pid
-
-"""
-
 default_config_data = {
     'listen_on': [],
     'listen_address': [],
@@ -707,16 +695,6 @@ def generate(snmp):
     with open(config_file_user, 'w') as f:
         f.write(config_text)
 
-    # Write systemd override file
-    dir = os.path.dirname(config_file_systemd)
-    if not os.path.isdir(dir):
-        os.mkdir(dir, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
-
-    tmpl = jinja2.Template(init_config_tmpl)
-    config_text = tmpl.render(snmp)
-    with open(config_file_systemd, 'w') as f:
-        f.write(config_text)
-
     return None
 
 def apply(snmp):
diff --git a/src/etc/systemd/system/snmpd.service.d/override.conf b/src/etc/systemd/system/snmpd.service.d/override.conf
new file mode 100644
index 000000000..c366f9073
--- /dev/null
+++ b/src/etc/systemd/system/snmpd.service.d/override.conf
@@ -0,0 +1,6 @@
+[Service]
+Environment=
+Environment="MIBSDIR=/usr/share/snmp/mibs:/usr/share/snmp/mibs/iana:/usr/share/snmp/mibs/ietf:/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp"
+ExecStart=
+ExecStart=/usr/sbin/snmpd -LS0-5d -Lf /dev/null -u Debian-snmp -g Debian-snmp -I -ipCidrRouteTable,inetCidrRouteTable -f -p /run/snmpd.pid
+
-- 
cgit v1.2.3