Author: glen Date: Tue May 22 14:22:27 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.6 (minor fixes, adds config)
---- Files affected:
packages/nagios-naglite:
nagios-naglite.spec (1.2 -> 1.3) , paths.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/nagios-naglite/nagios-naglite.spec
diff -u packages/nagios-naglite/nagios-naglite.spec:1.2
packages/nagios-naglite/nagios-naglite.spec:1.3
--- packages/nagios-naglite/nagios-naglite.spec:1.2 Mon Oct 31 13:33:20 2011
+++ packages/nagios-naglite/nagios-naglite.spec Tue May 22 16:22:21 2012
@@ -4,12 +4,12 @@
%include /usr/lib/rpm/macros.php
Summary: Naglite3 – Nagios status monitor for a NOC or operations room
Name: nagios-%{pname}
-Version: 1.5
+Version: 1.6
Release: 1
License: GPL
Group: Applications/WWW
-Source0: https://github.com/saz/Naglite3/tarball/master/%{pname}.tgz
-# Source0-md5: 29d7f404e6f51a0e0758478ef30a5611
+Source0:
https://github.com/saz/Naglite3/tarball/master/%{pname}-%{version}.tgz
+# Source0-md5: 5f75248d14eb6c9bd2e925729868cbc4
Source1: apache.conf
Source2: lighttpd.conf
Patch0: paths.patch
@@ -37,12 +37,15 @@
%prep
%setup -qc
mv *-Naglite3-*/* .
+mv config.php{.example,}
%patch0 -p1
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir}}
-cp -p *.php *.css $RPM_BUILD_ROOT%{_appdir}
+cp -p index.php *.css $RPM_BUILD_ROOT%{_appdir}
+cp -p config.php $RPM_BUILD_ROOT%{_sysconfdir}
+ln -s %{_sysconfdir}/config.php $RPM_BUILD_ROOT%{_appdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
@@ -75,6 +78,7 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/httpd.conf
%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
%{_appdir}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -83,6 +87,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2012/05/22 14:22:21 glen
+- up to 1.6 (minor fixes, adds config)
+
Revision 1.2 2011/10/31 12:33:20 glen
- php deps
================================================================
Index: packages/nagios-naglite/paths.patch
diff -u packages/nagios-naglite/paths.patch:1.1
packages/nagios-naglite/paths.patch:1.2
--- packages/nagios-naglite/paths.patch:1.1 Mon Oct 31 13:30:07 2011
+++ packages/nagios-naglite/paths.patch Tue May 22 16:22:21 2012
@@ -1,4 +1,3 @@
-diff -ur -x .svn -x .git -x .bzr -x CVS /usr/share/naglite/index.php
naglite/index.php
--- /usr/share/naglite/index.php 2011-10-04 16:48:18.000000000 +0300
+++ naglite/index.php 2011-10-31 14:16:17.871040318 +0200
@@ -16,7 +16,7 @@
@@ -19,5 +18,20 @@
/*
* Nothing to change below
-Only in naglite/: index.php~
-Only in naglite/: README.markdown
+--- nagios-naglite-1.6/config.php~ 2012-04-16 00:06:49.000000000 +0300
++++ nagios-naglite-1.6/config.php 2012-05-22 17:17:46.522296854 +0300
+@@ -8,7 +8,7 @@
+ **/
+
+ // Set file path to your nagios status log
+-// $statusFile = '/var/cache/nagios3/status.dat';
++// $statusFile = '/var/lib/nagios/status.dat';
+
+ // Refresh time in seconds
+ // $refresh = 10;
+@@ -20,4 +20,4 @@
+
+ // Enable fortune output
+ // $enableFortune = false;
+-// $fortunePath = "/usr/games/fortune";
++// $fortunePath = "/usr/bin/fortune";
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/nagios-naglite/nagios-naglite.spec?r1=1.2&r2=1.3
http://cvs.pld-linux.org/packages/nagios-naglite/paths.patch?r1=1.1&r2=1.2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
