Commit ff941f4c authored by Tim Smith's avatar Tim Smith
Browse files

Resolve Cookstyle 5.8 warnings



Fix the latest cookbook warnings
Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent 7526b0a2
...@@ -5,7 +5,6 @@ addons: ...@@ -5,7 +5,6 @@ addons:
packages: packages:
- chef-workstation - chef-workstation
# Don't `bundle install` which takes about 1.5 mins
install: echo "skip bundle install" install: echo "skip bundle install"
env: env:
...@@ -52,8 +51,6 @@ before_script: ...@@ -52,8 +51,6 @@ before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(chef shell-init bash)" - eval "$(chef shell-init bash)"
- chef --version - chef --version
- cookstyle --version
- foodcritic --version
script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen verify ${INSTANCE} script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen verify ${INSTANCE}
......
# This gemfile provides additional gems for testing and releasing this cookbook # This gemfile provides additional gems for testing and releasing this cookbook
# It is meant to be installed on top of ChefDK which provides the majority # It is meant to be installed on top of ChefDK / Chef Workstation which provide the majority
# of the necessary gems for testing this cookbook # of the necessary gems for testing this cookbook
# #
# Run 'chef exec bundle install' to install these dependencies # Run 'chef exec bundle install' to install these dependencies
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Cookbook:: rsyslog # Cookbook:: rsyslog
# Attributes:: default # Attributes:: default
# #
# Copyright:: 2009-2017, Chef Software, Inc. # Copyright:: 2009-2019, Chef Software, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -152,6 +152,6 @@ else ...@@ -152,6 +152,6 @@ else
end end
# rsyslog 3/4 do not support the new :omusrmsg:* format and need * instead # rsyslog 3/4 do not support the new :omusrmsg:* format and need * instead
if node['platform_family'] == 'rhel' && node['platform_version'].to_i < 6 if platform_family?('rhel') && node['platform_version'].to_i < 6
default['rsyslog']['default_facility_logs']['*.emerg'] = '*' default['rsyslog']['default_facility_logs']['*.emerg'] = '*'
end end
...@@ -2,6 +2,7 @@ driver: ...@@ -2,6 +2,7 @@ driver:
name: dokken name: dokken
privileged: true # because Docker and SystemD/Upstart privileged: true # because Docker and SystemD/Upstart
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
chef_license: accept-no-persist
transport: transport:
name: dokken name: dokken
......
...@@ -11,9 +11,9 @@ platforms: ...@@ -11,9 +11,9 @@ platforms:
box: mvbcoding/awslinux box: mvbcoding/awslinux
- name: centos-6 - name: centos-6
- name: centos-7 - name: centos-7
- name: debian-8
- name: debian-9 - name: debian-9
- name: fedora-28 - name: debian-10
- name: fedora-29
- name: opensuse-leap-42 - name: opensuse-leap-42
- name: ubuntu-14.04 - name: ubuntu-14.04
- name: ubuntu-16.04 - name: ubuntu-16.04
......
...@@ -3,17 +3,12 @@ maintainer 'Chef Software, Inc.' ...@@ -3,17 +3,12 @@ maintainer 'Chef Software, Inc.'
maintainer_email 'cookbooks@chef.io' maintainer_email 'cookbooks@chef.io'
license 'Apache-2.0' license 'Apache-2.0'
description 'Installs and configures rsyslog' description 'Installs and configures rsyslog'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '6.0.7' version '6.0.7'
recipe 'rsyslog', 'Sets up rsyslog for local logging'
recipe 'rsyslog::client', 'Sets up a client to log to a remote rsyslog server'
recipe 'rsyslog::server', 'Sets up an rsyslog server'
%w(ubuntu debian mint redhat centos amazon scientific oracle fedora zlinux).each do |os| %w(ubuntu debian mint redhat centos amazon scientific oracle fedora zlinux).each do |os|
supports os supports os
end end
source_url 'https://github.com/chef-cookbooks/rsyslog' source_url 'https://github.com/chef-cookbooks/rsyslog'
issues_url 'https://github.com/chef-cookbooks/rsyslog/issues' issues_url 'https://github.com/chef-cookbooks/rsyslog/issues'
chef_version '>= 12.7' if respond_to?(:chef_version) chef_version '>= 12.7'
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Cookbook:: rsyslog # Cookbook:: rsyslog
# Recipe:: client # Recipe:: client
# #
# Copyright:: 2009-2017, Chef Software, Inc. # Copyright:: 2009-2019, Chef Software, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Cookbook:: rsyslog # Cookbook:: rsyslog
# Recipe:: default # Recipe:: default
# #
# Copyright:: 2009-2017, Chef Software, Inc. # Copyright:: 2009-2019, Chef Software, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Cookbook:: rsyslog # Cookbook:: rsyslog
# Recipe:: server # Recipe:: server
# #
# Copyright:: 2009-2017, Chef Software, Inc. # Copyright:: 2009-2019, Chef Software, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
......
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