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

Cookstyle fixes


Signed-off-by: Tim Smith's avatarTim Smith <tsmith@chef.io>
parent 37290be7
......@@ -5,7 +5,6 @@ addons:
packages:
- chef-workstation
# Don't `bundle install` which takes about 1.5 mins
install: echo "skip bundle install"
env:
......@@ -39,10 +38,8 @@ before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(chef shell-init bash)"
- chef --version
- cookstyle --version
- foodcritic --version
script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen verify ${INSTANCE}
script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml CHEF_VERSION=${CHEF_VERSION} kitchen verify ${INSTANCE}
matrix:
include:
......
# 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
#
# Run 'chef exec bundle install' to install these dependencies
......
......@@ -2,6 +2,7 @@ driver:
name: dokken
privileged: true # because Docker and SystemD/Upstart
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
chef_license: accept-no-persist
transport:
name: dokken
......
......@@ -13,6 +13,7 @@ platforms:
- name: amazonlinux
driver_config:
box: mvbcoding/awslinux
- name: amazonlinux-2
- name: centos-6
- name: centos-7
- name: debian-9
......
......@@ -28,7 +28,6 @@ class Chef
resource_name :runit_service
default_action :enable
allowed_actions :nothing, :start, :stop, :enable, :disable, :restart, :reload, :status, :once, :hup, :cont, :term, :kill, :up, :down, :usr1, :usr2, :create, :reload_log
# For legacy reasons we allow setting these via attribute
property :sv_bin, String, default: lazy { node['runit']['sv_bin'] || (platform_family?('debian') ? '/usr/bin/sv' : '/sbin/sv') }
......
......@@ -3,11 +3,8 @@ maintainer 'Chef Software, Inc.'
maintainer_email 'cookbooks@chef.io'
license 'Apache-2.0'
description 'Installs runit and provides runit_service resource'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '5.1.2'
recipe 'runit', 'Installs and configures runit'
%w(ubuntu debian centos redhat amazon scientific oracle enterpriseenterprise zlinux).each do |os|
supports os
end
......
......@@ -45,7 +45,7 @@ when 'debian'
package pkg_name do # ~FC009
action :install
response_file 'runit.seed'
response_file 'runit.seed'
end
else
raise 'The cookbook only supports Debian/RHEL based Linux distributions. If you believe further platform support is possible please open a pull request.'
......
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