diff options
author | khramshinr <khramshinr@gmail.com> | 2024-07-18 14:41:58 +0600 |
---|---|---|
committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-10-08 20:59:02 +0000 |
commit | 4cbf3b87503bd40b045c6bb1ef3893cefda896fc (patch) | |
tree | 37f824246a2de341f4be20cf6445495c850ab7bf /src | |
parent | ded9fa21622b12e762aba230b094608a8cbc54cc (diff) | |
download | vyos-1x-4cbf3b87503bd40b045c6bb1ef3893cefda896fc.tar.gz vyos-1x-4cbf3b87503bd40b045c6bb1ef3893cefda896fc.zip |
T6525: Add default dir for ext-scripts without absolute path
(cherry picked from commit 2f52106dc160f217d6e27da45674c0231a93382a)
Diffstat (limited to 'src')
-rwxr-xr-x | src/conf_mode/service_snmp.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/conf_mode/service_snmp.py b/src/conf_mode/service_snmp.py index f65d0d6bc..24c180b98 100755 --- a/src/conf_mode/service_snmp.py +++ b/src/conf_mode/service_snmp.py @@ -39,6 +39,7 @@ 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' +default_script_dir = r'/config/user-data/' systemd_override = r'/run/systemd/system/snmpd.service.d/override.conf' systemd_service = 'snmpd.service' @@ -83,8 +84,20 @@ def get_config(config=None): tmp = {'::1': {'port': '161'}} snmp['listen_address'] = dict_merge(tmp, snmp['listen_address']) + if 'script_extensions' in snmp and 'extension_name' in snmp['script_extensions']: + for key, val in snmp['script_extensions']['extension_name'].items(): + if 'script' not in val: + continue + script_path = val['script'] + # if script has not absolute path, use pre configured path + if not os.path.isabs(script_path): + script_path = os.path.join(default_script_dir, script_path) + + snmp['script_extensions']['extension_name'][key]['script'] = script_path + return snmp + def verify(snmp): if 'deleted' in snmp: return None |