From 5c3b21d3a1c2b24c0c4414e63bc40a89051210ba Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 30 Dec 2019 22:06:42 +0100 Subject: snmp: adopt user/group to Debian Buster --- src/conf_mode/snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/conf_mode/snmp.py') diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py index 918c7f128..8f0b0c7c1 100755 --- a/src/conf_mode/snmp.py +++ b/src/conf_mode/snmp.py @@ -217,7 +217,7 @@ init_config_tmpl = """ SNMPDRUN=yes # snmpd options (use syslog, close stdin/out/err). -SNMPDOPTS='-LSed -u snmp -g snmp -I -ipCidrRouteTable,inetCidrRouteTable -p /run/snmpd.pid' +SNMPDOPTS='-LSed -u Debian-snmp -g Debian-snmp -I -ipCidrRouteTable,inetCidrRouteTable -p /run/snmpd.pid' """ default_config_data = { -- cgit v1.2.3 From 7b0ace6699d8075a6d093502126e2be4d631ef67 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 30 Dec 2019 22:47:27 +0100 Subject: snmp: T1921: migrate sysvinit default to systemd override file --- src/conf_mode/snmp.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'src/conf_mode/snmp.py') diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py index 8f0b0c7c1..cb77f7f22 100755 --- a/src/conf_mode/snmp.py +++ b/src/conf_mode/snmp.py @@ -31,12 +31,12 @@ from stat import S_IRWXU,S_IXGRP,S_IXOTH,S_IROTH,S_IRGRP from vyos.config import Config from vyos import ConfigError -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_init = r'/etc/default/snmpd' -default_script_dir = r'/config/user-data/' +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 OIDs = { @@ -213,11 +213,10 @@ init_config_tmpl = """ ### Autogenerated by snmp.py ### # This file controls the activity of snmpd -# snmpd control (yes means start daemon). -SNMPDRUN=yes +[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 -# snmpd options (use syslog, close stdin/out/err). -SNMPDOPTS='-LSed -u Debian-snmp -g Debian-snmp -I -ipCidrRouteTable,inetCidrRouteTable -p /run/snmpd.pid' """ default_config_data = { @@ -708,10 +707,14 @@ def generate(snmp): with open(config_file_user, 'w') as f: f.write(config_text) - # Write init config file + # 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_init, 'w') as f: + with open(config_file_systemd, 'w') as f: f.write(config_text) return None @@ -745,6 +748,7 @@ def apply(snmp): os.symlink(nonvolatiledir, volatiledir) # start SNMP daemon + os.system("sudo systemctl daemon-reload") os.system("sudo systemctl restart snmpd.service") # Passwords are not available immediately in the configuration file, -- cgit v1.2.3 From 9d5ffc8a44eb1033236cf9db12d24d8a6ccdc374 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 30 Dec 2019 22:55:10 +0100 Subject: snmp: T1921: change log options suppress error message: Dec 30 11:44:10 LR1 snmpd[2870]: error on subcontainer 'ia_addr' insert (-1) --- src/conf_mode/snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/conf_mode/snmp.py') diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py index cb77f7f22..488fb9d80 100755 --- a/src/conf_mode/snmp.py +++ b/src/conf_mode/snmp.py @@ -215,7 +215,7 @@ init_config_tmpl = """ [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 +ExecStart=/usr/sbin/snmpd -LS6d -Lf /dev/null -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ipCidrRouteTable,inetCidrRouteTable -f -p /run/snmpd.pid """ -- cgit v1.2.3 From c7b0585fa97779fc070f4a4a0fe825eb0729023c Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 30 Dec 2019 22:59:42 +0100 Subject: snmp: T1921: reduce syslog noise Remove informative but noisy messages: Dec 30 11:45:02 vyos snmpd[2870]: Connection from UDP: [172.16.100.1]:42781 ... Dec 30 11:45:02 vyos snmpd[2870]: Connection from UDP: [172.16.100.1]:57331 ... --- src/conf_mode/snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/conf_mode/snmp.py') diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py index 488fb9d80..0ad229bed 100755 --- a/src/conf_mode/snmp.py +++ b/src/conf_mode/snmp.py @@ -215,7 +215,7 @@ init_config_tmpl = """ [Service] ExecStart= -ExecStart=/usr/sbin/snmpd -LS6d -Lf /dev/null -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ipCidrRouteTable,inetCidrRouteTable -f -p /run/snmpd.pid +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 """ -- cgit v1.2.3