Merge pull request #90 from treydock/master

Fix error in template if rsyslog_version fact is not present

4 files changed, 52 insertions, 2 deletions

diff --git a/spec/classes/rsyslog_client_spec.rb b/spec/classes/rsyslog_client_spec.rb
index 52f933b..82865db 100644
--- a/spec/classes/rsyslog_client_spec.rb
+++ b/spec/classes/rsyslog_client_spec.rb
@@ -117,4 +117,30 @@ describe 'rsyslog::client', :type => :class do
       end
     end
   end
+
+  context "Rsyslog version = nil" do
+    let(:default_facts) do
+      {
+        :rsyslog_version => nil
+      }
+    end
+
+    context "osfamily = RedHat" do
+      let :facts do
+        default_facts.merge!({
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemmajrelease => 6,
+        })
+      end
+
+      context "default usage (osfamily = RedHat)" do
+        let(:title) { 'rsyslog-client-basic' }
+
+        it 'should compile' do
+          should contain_file('/etc/rsyslog.d/client.conf')
+        end
+      end
+    end
+  end
 end
diff --git a/spec/classes/rsyslog_spec.rb b/spec/classes/rsyslog_spec.rb
index 308ccf9..344d717 100644
--- a/spec/classes/rsyslog_spec.rb
+++ b/spec/classes/rsyslog_spec.rb
@@ -442,4 +442,28 @@ describe 'rsyslog', :type => :class do
     end
   end
 
+  context "Rsyslog version >= 8" do
+    let(:default_facts) do
+      {
+        :rsyslog_version => nil
+      }
+    end
+
+    context "osfamily = RedHat" do
+      let :facts do
+        default_facts.merge!({
+          :osfamily               => 'RedHat',
+          :operatingsystem        => 'RedHat',
+          :operatingsystemmajrelease => 6,
+        })
+      end
+
+      context "default usage (osfamily = RedHat)" do
+        it 'should compile' do
+          should contain_file('/etc/rsyslog.conf')
+          should contain_file('/etc/rsyslog.d/')
+        end
+      end
+    end
+  end
 end
diff --git a/templates/client.conf.erb b/templates/client.conf.erb
index d72e080..c05ae79 100644
--- a/templates/client.conf.erb
+++ b/templates/client.conf.erb
@@ -165,7 +165,7 @@ mail.*                         -/var/log/maillog
 cron.*                         /var/log/cron
 
 # Everybody gets emergency messages
-<% if @rsyslog_version.split('.')[0].to_i >= 8 -%>
+<% if @rsyslog_version and @rsyslog_version.split('.')[0].to_i >= 8 -%>
 *.emerg       :omusrmsg:*
 <% else -%>
 *.emerg				*
diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb
index 446c91e..1e5e1f6 100644
--- a/templates/rsyslog.conf.erb
+++ b/templates/rsyslog.conf.erb
@@ -35,7 +35,7 @@ $IncludeConfig <%= scope.lookupvar('rsyslog::rsyslog_d') -%>*.conf
 #
 # Emergencies are sent to everybody logged in.
 #
-<% if @rsyslog_version.split('.')[0].to_i >= 8 -%>
+<% if @rsyslog_version and @rsyslog_version.split('.')[0].to_i >= 8 -%>
 *.emerg       :omusrmsg:*
 <% else -%>
 *.emerg				*