summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-01-26 11:54:07 +0100
committerChristian Poessinger <christian@poessinger.com>2020-01-26 11:54:07 +0100
commit07d002e3be03babf1c3faaee43a90fe513969134 (patch)
tree6e97a3a6e64efee50bd58e8e3f7f1da644fb5e15 /src/conf_mode
parent585a90e4018f03b49dc151b786adc020f6cd4a0a (diff)
downloadvyos-1x-07d002e3be03babf1c3faaee43a90fe513969134.tar.gz
vyos-1x-07d002e3be03babf1c3faaee43a90fe513969134.zip
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
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/snmp.py22
1 files changed, 0 insertions, 22 deletions
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):