- stop bashism

- register cacti template

Changed files:
    cacti-template-snmpdiskio.spec -> 1.6

diff --git a/cacti-template-snmpdiskio.spec b/cacti-template-snmpdiskio.spec
index 34ed75e99f2342a7862df4ad2dade38399208a20..5ba03b26f13db27b0ddaa0810f87018c8c30834a 100644 (file)
--- a/cacti-template-snmpdiskio.spec
+++ b/cacti-template-snmpdiskio.spec
@@ -1,18 +1,16 @@
-# TODO
-# - %%post - add template to cacti
-%define                realname        snmpdiskio
-%include       /usr/lib/rpm/macros.perl
+%define                plugin  snmpdiskio
 Summary:       Disk I/O statistics (Read/Write bytes) in Cacti
 Summary(pl.UTF-8):     Statystyki operacji dyskowych we/wy (odczyt/zapis w bajtach) w Cacti
 Name:          cacti-addons-snmpdiskio
 Version:       0.9.4
-Release:       0.1
+Release:       0.3
 License:       GPL v2
 Group:         Applications/WWW
-#  snmpdiskio 0.9.4 (Disk I/O statistics on Linux) - http://forums.cacti.net/about12742.html
-Source0:       http://forums.cacti.net/files/%{realname}-%{version}.tar.gz
+Source0:       http://forums.cacti.net/files/%{plugin}-%{version}.tar.gz
+Patch0:                %{name}-bashism.patch
 # Source0-md5: 9f3512729ae6cad0904cac0fada719eb
-URL:           http://www.debianhelp.co.uk/cactitemplates.htm
+URL:           http://forums.cacti.net/about12742.html
+Requires:      cacti-add_template
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,6 +27,7 @@ w Cacti.
 Summary:       Disk I/O statistics (Read/Write bytes) over SNMP
 Summary(pl.UTF-8):     Statystyki operacji dyskowych we/wy (odczyt/zapis w bajtach) po SNMP
 Group:         Applications
+Requires:      awk
 
 %description -n snmpdiskio
 This set of simple scripts gives you disk I/O statistics over SNMP;
@@ -42,19 +41,31 @@ dyskowego wejścia/wyjścia. Ta wersja udostępnia tylko jedną wartość:
 Disk I/O (w bajtach/sekundę).
 
 %prep
-%setup -q -n %{realname}-%{version}
+%setup -q -n %{plugin}-%{version}
+%patch0 -p1
+
+cat > snmp.%{plugin}.conf <<'EOF'
+exec .1.3.6.1.4.1.2021.54 hdNum %{_sbindir}/snmpdiskio hdNum
+exec .1.3.6.1.4.1.2021.55 hdIndex %{_sbindir}/snmpdiskio hdIndex
+exec .1.3.6.1.4.1.2021.56 hdDescr %{_sbindir}/snmpdiskio hdDescr
+exec .1.3.6.1.4.1.2021.57 hdInBlocks %{_sbindir}/snmpdiskio hdInBlocks
+exec .1.3.6.1.4.1.2021.58 hdOutBlocks %{_sbindir}/snmpdiskio hdOutBlocks
+EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{cactidir}/cacti,%{cactidir}/scripts,%{cactidir}/resource/script_queries,%{cactidir}/resource/snmp_queries,%{cactidir}/resource/script_server,%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{cactidir}/resource/script_queries,%{cactidir}/resource/snmp_queries,%{_sbindir}}
 install cacti_data_query_snmp_disk_statistics.xml $RPM_BUILD_ROOT%{cactidir}/resource/script_queries
 install cacti_graph_template_disk_io_bytessec.xml $RPM_BUILD_ROOT%{cactidir}/resource/script_queries
 install partition.xml  $RPM_BUILD_ROOT%{cactidir}/resource/snmp_queries
-install snmpdiskio $RPM_BUILD_ROOT%{_bindir}
+install snmpdiskio $RPM_BUILD_ROOT%{_sbindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%{_sbindir}/cacti-add_template %{resourcedir}/cacti_host_template_webserver_lighttpd.xml
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README TODO
@@ -64,5 +75,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n snmpdiskio
 %defattr(644,root,root,755)
-%doc ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/snmpdiskio
+%doc README snmp.%{plugin}.conf
+%attr(755,root,root) %{_sbindir}/snmpdiskio