packages: cacti/cacti.spec, cacti/cacti.logrotate (NEW) - add logrotate, ad...

[glen]

Author: glen                         Date: Mon Dec 13 09:48:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add logrotate, adapter

---- Files affected:
packages/cacti:
   cacti.spec (1.130 -> 1.131) , cacti.logrotate (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cacti/cacti.spec
diff -u packages/cacti/cacti.spec:1.130 packages/cacti/cacti.spec:1.131
--- packages/cacti/cacti.spec:1.130	Wed Nov 17 13:31:46 2010
+++ packages/cacti/cacti.spec	Mon Dec 13 10:47:56 2010
@@ -19,6 +19,7 @@
 Source4:	%{name}-lighttpd.conf
 Source5:	%{name}-rrdpath.sql
 Source6:	%{name}-pa.sql
+Source7:	%{name}.logrotate
 # http://cactiusers.org/wiki/PluginArchitectureInstall
 # http://mirror.cactiusers.org/downloads/plugins/cacti-plugin-0.8.7g-PA-v2.8.tar.gz
 Patch0:		%{name}-PA.patch
@@ -32,14 +33,13 @@
 Patch8:		host_name-url.patch
 Patch9:		cli-relpath.patch
 # http://www.cacti.net/download_patches.php
-Patch10: 	data_source_deactivate.patch
-Patch11: 	graph_list_view.patch
-Patch12: 	html_output.patch
-Patch13: 	ldap_group_authenication.patch
-Patch14: 	script_server_command_line_parse.patch
-Patch15: 	ping.patch
-Patch16: 	poller_interval.patch
-
+Patch10:	data_source_deactivate.patch
+Patch11:	graph_list_view.patch
+Patch12:	html_output.patch
+Patch13:	ldap_group_authenication.patch
+Patch14:	script_server_command_line_parse.patch
+Patch15:	ping.patch
+Patch16:	poller_interval.patch
 URL:		http://www.cacti.net/
 BuildRequires:	rpm-perlprov
 BuildRequires:	sed >= 4.0
@@ -127,13 +127,13 @@
 %prep
 %setup -q
 %{?with_pa:%patch0 -p1}
-%patch10 -p1 
-%patch11 -p1 
-%patch12 -p1 
-%patch13 -p1 
-%patch14 -p1 
-%patch15 -p1 
-%patch16 -p1 
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %patch1 -p1
 %patch2 -p1
@@ -151,12 +151,12 @@
 cp %{SOURCE5} sql
 cp %{SOURCE6} sql
 
-rm -rf cacti-plugin-arch
-rm -rf lib/adodb
-rm -f log/.htaccess
-rm -f cli/.htaccess
-rm -f rra/.placeholder
-rm -f rra/.htaccess
+%{__rm} -r cacti-plugin-arch
+%{__rm} -r lib/adodb
+%{__rm} log/.htaccess
+%{__rm} cli/.htaccess
+%{__rm} rra/.placeholder
+%{__rm} rra/.htaccess
 
 # must require libs to get fatals on missing files, not include
 %{__sed} -i -e '
@@ -174,11 +174,11 @@
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 # make sure cacti runs out of the box
-sed -e "s,new_install,%{version}," -i sql/cacti.sql
+%{__sed} -i -e 's,new_install,%{version},' sql/cacti.sql
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_appdir}/{docs,plugins},/etc/cron.d,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_appdir}/{docs,plugins},/etc/{cron.d,logrotate.d},%{_sbindir}}
 install -d $RPM_BUILD_ROOT/var/{log,lib/%{name}}
 
 cp -a *.php $RPM_BUILD_ROOT%{_appdir}
@@ -191,6 +191,7 @@
 
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/config.php
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
+cp -a %{SOURCE7} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
@@ -245,6 +246,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(755,root,root) %{_sbindir}/cacti-poller
 %dir %{_appdir}
 %exclude %{_appdir}/install
@@ -282,6 +284,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.131  2010/12/13 09:47:56  glen
+- add logrotate, adapter
+
 Revision 1.130  2010/11/17 12:31:46  paszczus
 - release 4
 

================================================================
Index: packages/cacti/cacti.logrotate
diff -u /dev/null packages/cacti/cacti.logrotate:1.1
--- /dev/null	Mon Dec 13 10:48:01 2010
+++ packages/cacti/cacti.logrotate	Mon Dec 13 10:47:56 2010
@@ -0,0 +1,9 @@
+# logrotate cacti.log
+/var/log/cacti/cacti.log {
+	olddir /var/log/archive/cacti
+	rotate 7
+	daily
+	compress
+	create 644 http http
+	dateext
+}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/cacti.spec?r1=1.130&r2=1.131&f=u