flapjack 0.7.33 → 0.7.34

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 0.7.34 - 2013-11-20
+- Feature: update logoage (@jessereynolds)
+- Bug: flapjack-nagios-receiver to start daemonized from init script (@jessereynolds)
+
 # 0.7.33 - 2013-11-15
 - Feature: Ignore XMPP transcript history replay on connect gh-23 (@ali-graham)
 - Feature: Allow newlines in Jabber comments and commands gh-34 (@ali-graham)

data/README.md

@@ -1,4 +1,4 @@
-# Flapjack
+# ![Flapjack](https://raw.github.com/flpjck/flapjack/gh-pages/images/flapjack-2013-notext-transparent-50-50.png "Flapjack") Flapjack
 
 [![Build Status](https://travis-ci.org/flpjck/flapjack.png)](https://travis-ci.org/flpjck/flapjack)
 

data/dist/etc/init.d/flapjack-nagios-receiver

@@ -15,7 +15,7 @@ if [ ! $(which flapjack-nagios-receiver) ]; then
 fi
 
 # Evaluate command
-flapjack-nagios-receiver $1
+flapjack-nagios-receiver $1 --daemonize
 
 RETVAL=$?
 exit $RETVAL

data/lib/flapjack/gateways/web/views/_head.html.erb

@@ -2,4 +2,4 @@
 <link rel="stylesheet" href="/css/bootstrap.min.css" media="screen">
 <link rel="stylesheet" href="/css/flapjack.css" media="screen">
 <link rel="stylesheet" href="/css/bootstrap-responsive.min.css" media="screen">
-<link rel="shortcut icon" href="/img/flapjack-favicon-32-16.ico"> <!-- thank you http://xiconeditor.com/ -->
+<link rel="shortcut icon" href="/img/flapjack-favicon-64-32-24-16.ico"> <!-- thank you http://xiconeditor.com/ -->

data/lib/flapjack/gateways/web/views/_nav.html.erb

@@ -1,9 +1,10 @@
-<p>
-<a title="" href="/">Summary</a> |
-<a title="" href="/entities_all">All Entities</a> |
-<a title="" href="/entities_failing">Failing Entities</a> |
-<a title="" href="/checks_all">All Checks</a> |
-<a title="" href="/checks_failing">Failing Checks</a> |
-<a title="" href="/contacts">Contacts</a> |
-<a title="" href="/self_stats">Internal Statistics</a>
-</p>
+<div>
+  <a title="Summary" href="/"><img alt="Flapjack" src="/img/flapjack-2013-notext-transparent-25-40.png" width="25" height="40"></a>
+  <a title="Summary" href="/">Summary</a> |
+  <a title="All Entities" href="/entities_all">All Entities</a> |
+  <a title="Failing Entities" href="/entities_failing">Failing Entities</a> |
+  <a title="All Checks" href="/checks_all">All Checks</a> |
+  <a title="Failing Checks" href="/checks_failing">Failing Checks</a> |
+  <a title="Contacts" href="/contacts">Contacts</a> |
+  <a title="Internal Statistics" href="/self_stats">Internal Statistics</a>
+</div>

data/lib/flapjack/gateways/web/views/index.html.erb

@@ -14,10 +14,12 @@
           <%= nav %>
           <h2>Summary</h2>
         </div>
+
         <h4><a href="/entities_failing" title="failing entities"><%= h @count_failing_entities %></a> out of <a href="/entities_all" title="all entities"><%= h @count_all_entities %></a> entities have failing checks</h4>
         <h4><a href="/checks_failing" title="failing checks"><%= h @count_failing_checks %></a> out of <a href="/checks_all" title="all checks"><%= h @count_all_checks %></a> checks are failing</h4>
-        <img src="/img/flapjack-transparent-350-400.png" height="350" width="400">
+
       </div>
+
       <div id="push"></div>
     </div>
     <div id="footer">

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.7.33"
+  VERSION = "0.7.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.33
+  version: 0.7.34
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -453,6 +453,9 @@ files:
 - lib/flapjack/gateways/web/public/css/bootstrap-responsive.min.css
 - lib/flapjack/gateways/web/public/css/bootstrap.min.css
 - lib/flapjack/gateways/web/public/css/flapjack.css
+- lib/flapjack/gateways/web/public/img/flapjack-2013-notext-transparent-25-25.png
+- lib/flapjack/gateways/web/public/img/flapjack-2013-notext-transparent-25-40.png
+- lib/flapjack/gateways/web/public/img/flapjack-2013-vertical-transparent-300-386.png
 - lib/flapjack/gateways/web/public/img/flapjack-favicon-32-16.ico
 - lib/flapjack/gateways/web/public/img/flapjack-favicon-64-32-24-16.ico
 - lib/flapjack/gateways/web/public/img/flapjack-transparent-300.png
@@ -558,7 +561,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3960452771586560623
+      hash: 2860293635329435962
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -567,7 +570,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3960452771586560623
+      hash: 2860293635329435962
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23