Release 4.1.2

Signed-off-by: Tim Smith <[email protected]>
chef-cookbooks · Jul 18, 2018 · b3c3adc · b3c3adc
1 parent 981bdc0
commit b3c3adc
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,7 +37,7 @@ doc/
 # chef stuff
 Berksfile.lock
 .kitchen
-.kitchen.local.yml
+kitchen.local.yml
 vendor/
 .coverage/
 .zero-knife.rb

diff --git a/.travis.yml b/.travis.yml
@@ -22,15 +22,13 @@ env:
   - INSTANCE=default-amazonlinux CHEF_VERSION=12.7.2
   - INSTANCE=default-ubuntu-1404 CHEF_VERSION=12.7.2
   - INSTANCE=default-ubuntu-1604 CHEF_VERSION=12.7.2
-  - INSTANCE=default-debian-7 CHEF_VERSION=12.7.2
   - INSTANCE=default-debian-8 CHEF_VERSION=12.7.2
   - INSTANCE=default-debian-9 CHEF_VERSION=12.7.2
   - INSTANCE=default-centos-6 CHEF_VERSION=12.7.2
   - INSTANCE=default-centos-7 CHEF_VERSION=12.7.2
   - INSTANCE=default-amazonlinux
   - INSTANCE=default-ubuntu-1404
   - INSTANCE=default-ubuntu-1604
-  - INSTANCE=default-debian-7
   - INSTANCE=default-debian-8
   - INSTANCE=default-debian-9
   - INSTANCE=default-centos-6
@@ -43,7 +41,7 @@ before_script:
   - cookstyle --version
   - foodcritic --version
 
-script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml kitchen verify ${INSTANCE}
+script: KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen verify ${INSTANCE}
 
 matrix:
   include:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 This file is used to list changes made in each version of the runit cookbook.
 
+## 4.1.2 (2018-07-18)
+
+- Make Ubuntu the same as Debian where we template out a script instead of symlinking /etc/init.d/servicename to sv
+
 ## 4.1.1 (2018-04-26)
 
 - Fix typo in an error message

diff --git a/Gemfile b/Gemfile
@@ -6,5 +6,4 @@
 
 source 'https://rubygems.org'
 
-gem 'stove'
 gem 'community_cookbook_releaser'
diff --git a/chefignore b/chefignore
@@ -52,7 +52,7 @@ test/*
 features/*
 examples/*
 Procfile
-.kitchen*
+kitchen*
 .rubocop.yml
 spec/*
 .travis.yml

diff --git a/.kitchen.dokken.yml → kitchen.dokken.yml b/.kitchen.dokken.yml → kitchen.dokken.yml
@@ -19,13 +19,6 @@ platforms:
     image: dokken/amazonlinux
     pid_one_command: /sbin/init
 
-- name: debian-7
-  driver:
-    image: dokken/debian-7
-    pid_one_command: /sbin/init
-    intermediate_instructions:
-      - RUN /usr/bin/apt-get update
-
 - name: debian-8
   driver:
     image: dokken/debian-8

diff --git a/.kitchen.yml → kitchen.yml b/.kitchen.yml → kitchen.yml
@@ -14,7 +14,6 @@ platforms:
       box: mvbcoding/awslinux
   - name: centos-6
   - name: centos-7
-  - name: debian-7
   - name: debian-8
   - name: debian-9
   - name: oracle-6

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license 'Apache-2.0'
 description 'Installs runit and provides runit_service resource'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '4.1.1'
+version '4.1.2'
 
 recipe 'runit', 'Installs and configures runit'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,4 @@

		source 'https://rubygems.org'

		gem 'stove'
		gem 'community_cookbook_releaser'