Commit 5af05b4f authored by Tim Smith's avatar Tim Smith
Browse files

Testing updates

parent 2e5b51b4
......@@ -24,12 +24,14 @@ _Store
*.bk
*.bkup
.ruby-version
.idea
.ruby-gemset
.rvmrc
# YARD artifacts
.yardoc
_yardoc
doc/
.idea
#chef stuff
Berksfile.lock
......@@ -41,3 +43,4 @@ vendor/
#vagrant stuff
.vagrant/
.vagrant.d/
.kitchen/
---
driver:
name: vagrant
provisioner:
name: chef_zero
driver_config:
require_chef_omnibus: true
platforms:
- name: centos-5.10
- name: centos-6.6
- name: centos-6.7
- name: centos-7.1
- name: debian-6.0.10
- name: debian-7.8
run_list:
- recipe[apt]
- name: debian-7.8
- name: debian-8.1
run_list:
- recipe[apt]
- name: fedora-20
- name: fedora-21
- name: ubuntu-12.04
run_list:
- recipe[apt]
- recipe[apt::default]
- name: ubuntu-14.04
run_list:
- recipe[apt]
- recipe[apt::default]
- name: ubuntu-15.04
run_list:
- recipe[apt]
- recipe[apt::default]
suites:
- name: default
......@@ -40,10 +34,6 @@ suites:
attributes:
rsyslog:
use_relp: true
# CentOS and OmniOS do not support relp
excludes:
- centos-5.10
- omnios-r151006c
- name: client
run_list:
- recipe[rsyslog_test::client]
......
......@@ -7,11 +7,9 @@ AlignParameters:
Enabled: false
Encoding:
Enabled: false
HashSyntax:
Enabled: false
LineLength:
Enabled: false
MethodLength:
Max: 30
Enabled: false
SingleSpaceBeforeFirstArg:
Enabled: false
source 'https://supermarket.chef.io'
metadata
group :integration do
cookbook 'apt', '~> 2.0'
cookbook 'yum', '~> 3.0'
cookbook 'apt'
cookbook 'yum'
cookbook 'rsyslog_test', path: 'test/fixtures/rsyslog_test'
end
......@@ -3,7 +3,6 @@ source 'https://rubygems.org'
group :lint do
gem 'foodcritic', '~> 4.0'
gem 'rubocop', '~> 0.33'
gem 'rainbow', '< 2.0'
gem 'rake'
end
......
......@@ -79,7 +79,7 @@ Available attributes:
'port': Port to send logs to
'logs': Syslog log facilities to send (auth, authpriv, daemon, etc)
'protocol': Can be tcp or udp
'remote_template': Rsyslog template used for the messages
'remote_template': Rsyslog template used for the messages
```
Example:
......@@ -223,7 +223,7 @@ This section details "quick development" steps. For a detailed explanation, see
1. Clone this repository from GitHub:
$ git clone git@github.com:opscode-cookbooks/rsyslog.git
$ git clone git@github.com:chef-cookbooks/rsyslog.git
2. Create a git branch
......
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