nginx template listen_address fix

templates/default/grafana-nginx.conf.erb

@@ -1,5 +1,5 @@
 server {
-  listen                <%= "#{@listen_address}:" if @listen_address %><%= @listen_port %>;
+  listen                <%= "#{@listen_address}:" if !@listen_address.nil? && !@listen_address.empty? %><%= @listen_port %>;
 
   server_name           <%= @server_name %> <%= @server_aliases.join(" ") %>;
   access_log            /var/log/nginx/<%= @server_name %>.access.log;

test/integration/default/serverspec/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+gem 'serverspec'
+gem 'ohai'

test/integration/default/serverspec/localhost/default_spec.rb → test/integration/default/serverspec/spec/localhost/default_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require ::File.expand_path('../../spec_helper', __FILE__)
 
 describe file('/srv/apps/grafana') do
   let :owner do
@@ -107,3 +107,7 @@
   it { should be_owned_by 'root' }
   it { should be_grouped_into 'root' }
 end
+
+describe command("curl http://#{$ohaidata[:ipaddress]}/#/dashboard/file/default.json") do
+  its(:stdout) { should match /GrafanaCtrl/ }
+end

test/integration/default/serverspec/spec_helper.rb → test/integration/default/serverspec/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'serverspec'
+require 'ohai'
 
 set :backend, :exec
 
@@ -10,3 +11,7 @@
     c.sudo_password = ENV['SUDO_PASSWORD']
   end
 end
+
+ohai = Ohai::System.new
+ohai.all_plugins
+$ohaidata = ohai.data