- add Samba_locked_machine,hddtemp rewrite spec

Changed files:
    cacti-addons.spec -> 1.5

diff --git a/cacti-addons.spec b/cacti-addons.spec
index 84e808368e1f75c1042fbb7b46ea654213ed20bd..0d47a79d7b710e411383d843a13f82f98dca2987 100644 (file)
--- a/cacti-addons.spec
+++ b/cacti-addons.spec
@@ -1,27 +1,35 @@
-# TODO - add another
+# TODO - add another
+#      - patches for path to files
+#      - %post - add template to cacti
 %define                namesrc cacti_templates
 %include       /usr/lib/rpm/macros.perl
-Summary:       Plugin for Cacti - Links
-Summary(pl.UTF-8):     Wtyczka do Cacti - Links
+Summary:       Add-ons for Cacti
+Summary(pl.UTF-8):     Dodatki do Cacti
 Name:          cacti-addons
 Version:       0.1
 Release:       0.1
 License:       GPL v2
 Group:         Applications/WWW
+#Show locked Machines, Shares and Files from a Samba Server - http://forums.cacti.net/about7516.html
+Source0:       http://forums.cacti.net/files/samba.tar.gz
+# Source0-md5: b8fc04a74b8ab297fd39fb6fb02d80f4
 # Cacti Poller Statistics - http://forums.cacti.net/about18057-0-asc-0.html
-Source0:       http://forums.cacti.net/files/ss_poller.php.gz
-# Source0-md5: 5de3f1cfeb5803a9c76a6e1472dd2478
-Source1:       http://forums.cacti.net/files/cacti_host_template_local_cacti_polling_host_171.xml
-# Source1-md5: 3f54a6579f06745426163685facac558
+Source1:       http://forums.cacti.net/files/ss_poller.php.gz
+# Source1-md5: 5de3f1cfeb5803a9c76a6e1472dd2478
+Source2:       http://forums.cacti.net/files/cacti_host_template_local_cacti_polling_host_171.xml
+# Source2-md5: 3f54a6579f06745426163685facac558
 # Adding template from command line - http://forums.cacti.net/about8827.html
-Source2:       http://forums.cacti.net/files/add_template.zip
-# Source2-md5: a38f01091cb4bf1dbd86db29d6c4c966
+Source3:       http://forums.cacti.net/files/add_template.zip
+# Source3-md5: a38f01091cb4bf1dbd86db29d6c4c966
 # DNS Server Response Time - http://forums.cacti.net/about6332.html
-#TODO - patch path
-Source3:       http://forums.cacti.net/files/cacti_graph_template_dnsresponsetime_204__fixed_timeout_and_interval_161.xml
-# Source3-md5: abf46930508377099b37d696648ce7de
-Source4:       http://forums.cacti.net/files/dnsresponsetimeloop_115.txt
-# Source4-md5: 0844f7d58ff77904416dee5b120c31cf
+Source4:       http://forums.cacti.net/files/cacti_graph_template_dnsresponsetime_204__fixed_timeout_and_interval_161.xml
+# Source4-md5: abf46930508377099b37d696648ce7de
+Source5:       http://forums.cacti.net/files/dnsresponsetimeloop_115.txt
+# Source5-md5: 0844f7d58ff77904416dee5b120c31cf
+# hddtemp - http://forums.cacti.net/about15020.html , http://forums.cacti.net/about15743.html
+#URL:  http://www.pawelko.net/Cacti/3-Hddtemp-Template-For-Cacti
+Source6:       http://www.pawelko.net/xmedia/cacti/cacti-linux-hddtemp-1.0.tar.gz
+# Source6-md5: d08898b43978ccbd863076c4b3124987
 URL:           http://www.debianhelp.co.uk/cactitemplates.htm
 BuildRequires: rpm-perlprov
 Requires:      cacti
@@ -76,19 +84,53 @@ delay between queries) during Cacti default sample intervall of 300
 seconds and the returns minimum, median, average and maximum response
 times.
 
+%package Samba_locked_machine
+Summary:       Graphs the locked machines, shares and files from a samba server
+Summary(pl.UTF-8):     Samba - wykresy przyłączonych stacji, udziałów i plików w Cacti
+Group:         Applications/WWW
+
+%description Samba_locked_machine
+Add-on for Cacti - graphs the locked machines, shares and files from a
+samba server in gauge mode.
+
+%description Samba_locked_machine -l pl.UTF-8
+Dodatek do cacti - Samba - wykresy przyłączonych stacji, udziałów
+i plików.
+
+%package hddtemp
+Summary:       Template to query hddtemp deamon and graph disks temperature
+Summary(pl.UTF-8):     Wykresy temperatury dysków - dane pobierane z hddtemp
+Group:         Applications/WWW
+
+%description hddtemp
+Template to query hddtemp deamon and graph disks temperature.
+
+%description hddtemp -l pl.UTF-8
+Wykresy temperatury dysków - dane pobierane z hddtemp.
+
 %prep
+%setup -q -c -a3 -a6
+gzip -dNc %{SOURCE1} > ./ss_poller.php
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{webcactiscriptdir},%{webcactiscriptqueriesdir},%{webcactisnmpqueriesdir},%{webcactiscrptserverdir}}
-gzip -dc %{SOURCE0} > $RPM_BUILD_ROOT%{webcactiscriptdir}/ss_poller.php
-install %{SOURCE1} $RPM_BUILD_ROOT%{webcactiscriptqueriesdir}/cacti_host_template_local_cacti_polling_host.xml
+install -d $RPM_BUILD_ROOT{%{webcactiroot}/cacti,%{webcactiscriptdir},%{webcactiscriptqueriesdir},%{webcactisnmpqueriesdir},%{webcactiscrptserverdir},%{_bindir}}
 
-unzip -x -d $RPM_BUILD_ROOT%{webcactiroot} %{SOURCE2}
+install samba/cacti_graph_template_snmp_samba.xml $RPM_BUILD_ROOT%{webcactiscriptqueriesdir}
+install samba/samba.pl $RPM_BUILD_ROOT%{webcactiscriptdir}
+
+install ss_poller.php $RPM_BUILD_ROOT%{webcactiscriptdir}/ss_poller.php
+install %{SOURCE2} $RPM_BUILD_ROOT%{webcactiscriptqueriesdir}/cacti_host_template_local_cacti_polling_host.xml
+
+install cacti/add_template.php $RPM_BUILD_ROOT%{webcactiroot}/cacti/add_template.php
 
 install %{SOURCE4} $RPM_BUILD_ROOT%{webcactiscriptqueriesdir}/cacti_graph_template_dnsresponsetime.xml
-install %{SOURCE4} $RPM_BUILD_ROOT%{webcactiscriptdir}/dnsResponseTime.pl
+install %{SOURCE5} $RPM_BUILD_ROOT%{webcactiscriptdir}/dnsResponseTime.pl
+
+install cacti-linux-hddtemp-1.0/hddtemp.xml $RPM_BUILD_ROOT%{webcactiscriptqueriesdir}
+install cacti-linux-hddtemp-1.0/hddtemp.php $RPM_BUILD_ROOT%{webcactiscriptdir}
+install cacti-linux-hddtemp-1.0/cacti_graph_template_linux_hddtemp*.xml $RPM_BUILD_ROOT%{webcactiscriptqueriesdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,3 +150,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{webcactiscriptdir}/dnsResponseTime.pl
 %{webcactiscriptqueriesdir}/cacti_graph_template_dnsresponsetime.xml
+
+%files Samba_locked_machine
+%defattr(644,root,root,755)
+%attr(755,root,root) %{webcactiscriptdir}/samba.pl
+%{webcactiscriptqueriesdir}/cacti_graph_template_snmp_samba.xml
+
+%files hddtemp 
+%defattr(644,root,root,755)
+%doc cacti-linux-hddtemp-1.0/{CHANGELOG.txt,INSTALL.txt}
+%attr(755,root,root) %{webcactiscriptdir}/hddtemp.php
+%{webcactiscriptqueriesdir}/cacti_graph_template_linux_hddtemp_disk_temperature*.xml
+%{webcactiscriptqueriesdir}/hddtemp.xml