...
 
Commits (9)
......@@ -5,9 +5,6 @@ Lint/AmbiguousRegexpLiteral:
Exclude:
- 'test/**/*'
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
# SupportedStyles: slashes, percent_r, mixed
Style/RegexpLiteral:
Exclude:
- 'test/**/*'
......@@ -18,34 +18,42 @@ services: docker
env:
matrix:
- INSTANCE=default-ubuntu-1404
- INSTANCE=default-ubuntu-1604
- INSTANCE=default-ubuntu-1804
- INSTANCE=default-centos-6
- INSTANCE=default-centos-7
- INSTANCE=default-debian-8
- INSTANCE=default-centos-8
- INSTANCE=default-debian-9
- INSTANCE=default-debian-10
- INSTANCE=default-fedora-latest
- INSTANCE=default-opensuse-leap
- INSTANCE=input-file-resource-ubuntu-1404
- INSTANCE=default-opensuse-leap-15
- INSTANCE=input-file-resource-ubuntu-1604
- INSTANCE=input-file-resource-ubuntu-1804
- INSTANCE=input-file-resource-centos-6
- INSTANCE=input-file-resource-centos-7
- INSTANCE=input-file-resource-debian-8
- INSTANCE=input-file-resource-centos-8
- INSTANCE=input-file-resource-debian-9
- INSTANCE=input-file-resource-debian-10
- INSTANCE=input-file-resource-fedora-latest
- INSTANCE=input-file-resource-opensuse-leap
- INSTANCE=client-ubuntu-1404
- INSTANCE=input-file-resource-opensuse-leap-15
- INSTANCE=client-ubuntu-1604
- INSTANCE=client-ubuntu-1804
- INSTANCE=client-centos-6
- INSTANCE=client-centos-7
- INSTANCE=client-debian-8
- INSTANCE=client-centos-8
- INSTANCE=client-debian-9
- INSTANCE=client-debian-10
- INSTANCE=client-fedora-latest
- INSTANCE=client-opensuse-leap
- INSTANCE=server-ubuntu-1404
- INSTANCE=client-opensuse-leap-15
- INSTANCE=server-ubuntu-1604
- INSTANCE=server-ubuntu-1804
- INSTANCE=server-centos-6
- INSTANCE=server-centos-7
- INSTANCE=server-debian-8
- INSTANCE=server-centos-8
- INSTANCE=server-debian-9
- INSTANCE=server-debian-10
- INSTANCE=server-fedora-latest
- INSTANCE=server-opensuse-leap
- INSTANCE=server-opensuse-leap-15
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
......
......@@ -2,6 +2,17 @@
This file is used to list changes made in each version of the rsyslog cookbook.
## 7.0.0 (2019-12-23)
- Update for Chef 15 license agreement and Chef Workstation - [@tas50](https://github.com/tas50)
- Resolve Cookstyle 5.8 warnings - [@tas50](https://github.com/tas50)
- Fixes spec tests locally and on travis-ci
- Expand testing to the latest platformms - [@tas50](https://github.com/tas50)
- Fix Amazon Linux 201X and 2.x support - [@tas50](https://github.com/tas50)
- Fix opensuse failures - [@tas50](https://github.com/tas50)
- Remove support for EOL RHEL 5
- Require Chef Infra 13 or later
## 6.0.7 (2018-08-01)
- Optional creation of default configuration file 50-default.conf
......
......@@ -15,7 +15,7 @@ Installs and configures rsyslog to replace syslogd for client and/or server use.
### Chef
- Chef 12.7+
- Chef 13+
### Other
......
......@@ -96,6 +96,7 @@ case node['platform_family']
when 'suse'
default['rsyslog']['service_name'] = 'syslog'
default['rsyslog']['group'] = 'root'
default['rsyslog']['dir_group'] = 'trusted'
default['rsyslog']['default_facility_logs'] = {
'*.emerg' => ':omusrmsg:*',
'mail.*' => "-#{node['rsyslog']['default_log_dir']}/mail.log",
......@@ -113,7 +114,7 @@ when 'suse'
'local4.*;local5.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages",
'local6.*;local7.*' => "-#{node['rsyslog']['default_log_dir']}/localmessages",
}
when 'rhel', 'fedora'
when 'rhel', 'fedora', 'amazon'
default['rsyslog']['working_dir'] = '/var/lib/rsyslog'
# format { facility => destination }
default['rsyslog']['default_facility_logs'] = {
......@@ -125,8 +126,8 @@ when 'rhel', 'fedora'
'uucp,news.crit' => "#{node['rsyslog']['default_log_dir']}/spooler",
'local7.*' => "#{node['rsyslog']['default_log_dir']}/boot.log",
}
# RHEL >= 7 and Fedora use journald in systemd. Amazon Linux doesn't.
if node['platform'] != 'amazon' && node['platform_version'].to_i >= 7
# journald is used in systemd
if node['init_package'] != 'systemd'
default['rsyslog']['modules'] = %w(imuxsock imjournal)
default['rsyslog']['additional_directives'] = { 'OmitLocalLogging' => 'on', 'IMJournalStateFile' => 'imjournal.state' }
end
......@@ -150,8 +151,3 @@ else
'*.emerg' => ':omusrmsg:*',
}
end
# rsyslog 3/4 do not support the new :omusrmsg:* format and need * instead
if platform_family?('rhel') && node['platform_version'].to_i < 6
default['rsyslog']['default_facility_logs']['*.emerg'] = '*'
end
......@@ -45,22 +45,19 @@ a.out
# Testing #
###########
.watchr
.rspec
spec/*
spec/fixtures/*
test/*
features/*
examples/*
Guardfile
Procfile
kitchen*
.kitchen*
.rubocop.yml
spec/*
Rakefile
.travis.yml
.foodcritic
.codeclimate.yml
appveyor.yml
# SCM #
#######
......@@ -93,14 +90,3 @@ CONTRIBUTING*
CHANGELOG*
TESTING*
# Strainer #
############
Colanderfile
Strainerfile
.colander
.strainer
# Vagrant #
###########
.vagrant
Vagrantfile
......@@ -20,6 +20,11 @@ platforms:
image: dokken/amazonlinux
pid_one_command: /sbin/init
- name: amazonlinux-2
driver:
image: dokken/amazonlinux-2
pid_one_command: /usr/lib/systemd/systemd
- name: debian-8
driver:
image: dokken/debian-8
......@@ -34,6 +39,13 @@ platforms:
intermediate_instructions:
- RUN /usr/bin/apt-get update
- name: debian-10
driver:
image: dokken/debian-10
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- name: centos-6
driver:
image: dokken/centos-6
......@@ -44,26 +56,46 @@ platforms:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
- name: centos-8
driver:
image: dokken/centos-8
pid_one_command: /usr/lib/systemd/systemd
- name: oraclelinux-6
driver:
image: dokken/oraclelinux-6
pid_one_command: /sbin/init
- name: oraclelinux-7
driver:
image: dokken/oraclelinux-7
pid_one_command: /usr/lib/systemd/systemd
- name: oraclelinux-8
driver:
image: dokken/oraclelinux-8
pid_one_command: /usr/lib/systemd/systemd
- name: fedora-latest
driver:
image: dokken/fedora-latest
pid_one_command: /usr/lib/systemd/systemd
- name: ubuntu-14.04
- name: ubuntu-16.04
driver:
image: dokken/ubuntu-14.04
pid_one_command: /sbin/init
image: dokken/ubuntu-16.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- name: ubuntu-16.04
- name: ubuntu-18.04
driver:
image: dokken/ubuntu-16.04
image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- name: opensuse-leap
- name: opensuse-leap-15
driver:
image: dokken/opensuse-leap
image: dokken/opensuse-leap-15
pid_one_command: /bin/systemd
......@@ -4,19 +4,22 @@ driver:
provisioner:
name: chef_zero
deprecations_as_errors: true
chef_license: accept-no-persist
platforms:
- name: amazonlinux
driver_config:
box: mvbcoding/awslinux
- name: amazonlinux-2
- name: centos-6
- name: centos-7
- name: centos-8
- name: debian-9
- name: debian-10
- name: fedora-29
- name: opensuse-leap-42
- name: ubuntu-14.04
- name: fedora-31
- name: opensuse-leap-15
- name: ubuntu-16.04
- name: ubuntu-18.04
suites:
- name: default
......
......@@ -3,12 +3,12 @@ maintainer 'Chef Software, Inc.'
maintainer_email 'cookbooks@chef.io'
license 'Apache-2.0'
description 'Installs and configures rsyslog'
version '6.0.7'
version '7.0.0'
%w(ubuntu debian mint redhat centos amazon scientific oracle fedora zlinux).each do |os|
%w(ubuntu debian linuxmint redhat centos amazon scientific oracle fedora zlinux).each do |os|
supports os
end
source_url 'https://github.com/chef-cookbooks/rsyslog'
issues_url 'https://github.com/chef-cookbooks/rsyslog/issues'
chef_version '>= 12.7'
chef_version '>= 13'