diff options
| -rw-r--r-- | debian/vyos-1x.install | 1 | ||||
| -rwxr-xr-x | src/conf_mode/snmp.py | 22 | ||||
| -rw-r--r-- | src/etc/systemd/system/snmpd.service.d/override.conf | 6 |
3 files changed, 7 insertions, 22 deletions
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install index de61f71dd..dfa6ab0f9 100644 --- a/debian/vyos-1x.install +++ b/debian/vyos-1x.install @@ -1,5 +1,6 @@ etc/init.d etc/vyos +etc/systemd lib/ opt/ usr/ 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 + |