Commit c57fa70a authored by Tim Smith's avatar Tim Smith

Platform updates in the specs and fix the license string

Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent 747cac79
......@@ -11,7 +11,7 @@ Installs and configures rsyslog to replace syslogd for client and/or server use.
- Debian/Ubuntu
- RHEL/CentOS/Scientific/Amazon/Oracle
- Fedora
- OmniOS r151006c
- OmniOS
- OpenSUSE
### Chef
......
name 'rsyslog'
maintainer 'Chef Software, Inc.'
maintainer_email 'cookbooks@chef.io'
license 'Apache 2.0'
license 'Apache-2.0'
description 'Installs and configures rsyslog'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '6.0.1'
......
......@@ -233,7 +233,7 @@ describe 'rsyslog::default' do
context 'COOK-3608 maillog regression test' do
let(:chef_run) do
ChefSpec::ServerRunner.new(platform: 'redhat', version: '6.3').converge(described_recipe)
ChefSpec::ServerRunner.new(platform: 'centos', version: '6.8').converge(described_recipe)
end
it 'outputs mail.* to /var/log/maillog' do
......@@ -241,9 +241,9 @@ describe 'rsyslog::default' do
end
end
context 'syslog service' do
context 'syslog service on rhel 5' do
let(:chef_run) do
ChefSpec::ServerRunner.new(platform: 'redhat', version: '5.8').converge(described_recipe)
ChefSpec::ServerRunner.new(platform: 'centos', version: '5.11').converge(described_recipe)
end
it 'stops and starts the syslog service on RHEL' do
......@@ -253,7 +253,7 @@ describe 'rsyslog::default' do
end
context 'system-log service' do
{ 'omnios' => '151002', 'smartos' => 'joyent_20130111T180733Z' }.each do |p, pv|
{ 'omnios' => '151018', 'smartos' => 'joyent_20130111T180733Z' }.each do |p, pv|
let(:chef_run) do
ChefSpec::ServerRunner.new(platform: p, version: pv).converge(described_recipe)
end
......@@ -266,7 +266,7 @@ describe 'rsyslog::default' do
context 'on OmniOS' do
let(:chef_run) do
ChefSpec::ServerRunner.new(platform: 'omnios', version: '151002').converge(described_recipe)
ChefSpec::ServerRunner.new(platform: 'omnios', version: '151018').converge(described_recipe)
end
let(:template) { chef_run.template('/var/svc/manifest/system/rsyslogd.xml') }
......
name 'rsyslog_test'
maintainer 'Chef Software, Inc.'
maintainer_email 'cookbooks@chef.io'
license 'Apache 2.0'
license 'Apache-2.0'
description 'Tests rsyslog cookbook'
version '1.0'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment