From 938e318bbfec1900aceea25c2702f234961c0493 Mon Sep 17 00:00:00 2001 From: Kanagaraj M Date: Thu, 17 Apr 2014 17:39:27 +0530 Subject: snmp: Fix conf file name and permission Renamed the file to snmpmanagers.conf, as .cfg files nagios specific files. Changed the permission to nagios:nagios, as trapgenerater fails otherwise. Change-Id: I2fbc4404c7177ee3bcaeab3151cbcba8e062772a Signed-off-by: Kanagaraj M --- config/Makefile.am | 2 +- config/snmpmanagers.cfg | 5 ----- config/snmpmanagers.conf | 5 +++++ configure.ac | 2 +- nagios-server-addons.spec.in | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 config/snmpmanagers.cfg create mode 100644 config/snmpmanagers.conf diff --git a/config/Makefile.am b/config/Makefile.am index 4435879..60da34c 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -6,7 +6,7 @@ glusternagiosconf_DATA = \ gluster-templates.cfg \ gluster-contacts.cfg \ host-monitoring-services.in \ - snmpmanagers.cfg \ + snmpmanagers.conf \ $(NULL) glusternagiosdefaultconfdir = $(sysconfdir)/nagios/gluster/default diff --git a/config/snmpmanagers.cfg b/config/snmpmanagers.cfg deleted file mode 100644 index 1e595f4..0000000 --- a/config/snmpmanagers.cfg +++ /dev/null @@ -1,5 +0,0 @@ -#Configure the trap destinations -#Provide the ipaddress and community names of SNMP manangers -# -#localhost public -#10.70.1.219 public \ No newline at end of file diff --git a/config/snmpmanagers.conf b/config/snmpmanagers.conf new file mode 100644 index 0000000..1e595f4 --- /dev/null +++ b/config/snmpmanagers.conf @@ -0,0 +1,5 @@ +#Configure the trap destinations +#Provide the ipaddress and community names of SNMP manangers +# +#localhost public +#10.70.1.219 public \ No newline at end of file diff --git a/configure.ac b/configure.ac index 7b53aba..7a7e972 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,7 @@ AC_SUBST([hostmonitoringserviceslist], ['/etc/nagios/gluster/host-monitoring-ser AC_SUBST([nrpepath], ['/usr/lib64/nagios/plugins/check_nrpe']) AC_SUBST([glusterautoconfdir], ['/etc/nagios/gluster']) AC_SUBST([glusterhostconfigtemplatedir], ['/etc/nagios/gluster/default']) -AC_SUBST([snmpmanagerlist], ['/etc/nagios/gluster/snmpmanagers.cfg']) +AC_SUBST([snmpmanagerlist], ['/etc/nagios/gluster/snmpmanagers.conf']) # Checking for pyflakes AC_PATH_PROG([PYFLAKES], [pyflakes]) diff --git a/nagios-server-addons.spec.in b/nagios-server-addons.spec.in index 9a7cd4c..2ae7721 100644 --- a/nagios-server-addons.spec.in +++ b/nagios-server-addons.spec.in @@ -196,6 +196,7 @@ fi %{_datadir}/nagios/html/pnp4nagios/templates.dist/check_swap_usage.php %attr(0755, -, -) %{_libdir}/nagios/plugins/gluster/* %attr(0775, root, nagios) %dir %{_sysconfdir}/nagios/gluster +%attr(-, root, nagios) %{_sysconfdir}/nagios/gluster/snmpmanagers.conf %{_sysconfdir}/nagios/gluster/* /usr/share/snmp/mibs/* -- cgit