update to current master (6fa421)

diff --git a/nagios-naglite.spec b/nagios-naglite.spec
index b9543ae2e168b1c90dc5025e95b12673539b294f..37a16c86984e4fce7a39bcbb36b30ee308d35b23 100644 (file)
--- a/nagios-naglite.spec
+++ b/nagios-naglite.spec
@@ -7,8 +7,8 @@ Version:        1.6
 Release:       5
 License:       GPL
 Group:         Applications/WWW
-Source0:       https://github.com/saz/Naglite3/tarball/master/%{pname}-%{version}.tgz
-# Source0-md5: 5f75248d14eb6c9bd2e925729868cbc4
+Source0:       https://github.com/saz/Naglite3/archive/master/%{pname}-%{version}.tar.gz
+# Source0-md5: 5a107b76f318615e1e65e7b1b23afa44
 Source1:       apache.conf
 Source2:       lighttpd.conf
 Patch0:                paths.patch
@@ -35,7 +35,7 @@ operations room. Inspired by Naglite and Naglite2.
 
 %prep
 %setup -qc
-mv *-Naglite3-*/* .
+mv Naglite3-*/* .
 mv config.php{.example,}
 %patch0 -p1
 

diff --git a/paths.patch b/paths.patch
index 51eb59efd1651e88aeb7d89dba923900a363688d..037e0b416fffbc9cb2a5250439bfdaf2a0fc71b3 100644 (file)
--- a/paths.patch
+++ b/paths.patch
@@ -1,25 +1,29 @@
---- /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 @@
+--- nagios-naglite-1.6/index.php~      2013-10-28 23:52:47.000000000 +0200
++++ nagios-naglite-1.6/index.php       2015-08-06 18:14:13.011808961 +0300
+@@ -18,10 +18,10 @@
   **/
  
  // Set file path to your nagios status log
 -$statusFile = '/var/cache/nagios3/status.dat';
 +$statusFile = '/var/lib/nagios/status.dat';
  
+ // Objects file
+-$objectsFile = '/var/cache/icinga/objects.cache';
++$objectsFile = '/var/lib/nagios/objects.cache';
+ 
  // Default refresh time in seconds
  $refresh = 10;
-@@ -27,7 +27,7 @@
+@@ -35,7 +35,7 @@
  
  // Enable fortune output
  $enableFortune = false;
 -$fortunePath = "/usr/games/fortune";
 +$fortunePath = "/usr/bin/fortune";
  
- /* 
-  * Nothing to change below
---- 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
+ // Uncomment to show custom heading
+ //$nagliteHeading = '<Your Custom Heading>';
+--- nagios-naglite-1.6/config.php~     2015-08-06 18:09:21.000000000 +0300
++++ nagios-naglite-1.6/config.php      2015-08-06 18:09:45.158645407 +0300
 @@ -8,7 +8,7 @@
   **/
  
@@ -29,9 +33,12 @@
  
  // Refresh time in seconds
  // $refresh = 10; 
-@@ -20,4 +20,4 @@
+@@ -30,7 +30,7 @@
  
  // Enable fortune output
  // $enableFortune = false;
 -// $fortunePath = "/usr/games/fortune";
 +// $fortunePath = "/usr/bin/fortune";
+ 
+ // Set to callable to write custom heading by function
+ // $nagliteHeading = function() { echo("<h2>This is Naglite3</h2>\n"); };