From 1e8a1018e2a6c0286c9d226a5b727b5619aa4d0d Mon Sep 17 00:00:00 2001
From: Austin Heiman <atheimanksu@gmail.com>
Date: Thu, 4 Jan 2018 18:04:17 -0600
Subject: [PATCH 1/2] look for tests in /opt/verifier on containers

This is explained in the kitchen-dokken readme https://github.com/someara/kitchen-dokken#tmpfs-on-tmp
---
 .kitchen.dokken.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
index 2f6018cc..49cdeec1 100644
--- a/.kitchen.dokken.yml
+++ b/.kitchen.dokken.yml
@@ -11,9 +11,10 @@ provisioner:
   name: dokken
   require_chef_omnibus: 12.19.36
 
-# TODO: uncomment after converting to inspec
-# verifier:
-#   name: inspec
+verifier:
+  root_path: '/opt/verifier'
+  # TODO: uncomment after converting to inspec
+  # name: inspec
 
 platforms:
 - name: centos-6

From c4269480af1dc72d717a0db0c82539b95fe9429a Mon Sep 17 00:00:00 2001
From: Austin Heiman <atheimanksu@gmail.com>
Date: Thu, 4 Jan 2018 18:18:06 -0600
Subject: [PATCH 2/2] use sudo rather than su for init scripts

fixes #366
---
 metadata.rb                                 | 2 +-
 templates/default/redis.init.erb            | 3 ++-
 templates/default/redis.upstart.conf.erb    | 3 ++-
 templates/default/sentinel.init.erb         | 3 ++-
 templates/default/sentinel.upstart.conf.erb | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/metadata.rb b/metadata.rb
index e8b00728..c9b99610 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache-2.0'
 description      'Installs/Configures redis'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '2.6.1'
+version          '2.7.0'
 
 %w(
   amazon
diff --git a/templates/default/redis.init.erb b/templates/default/redis.init.erb
index e687616a..e306865b 100644
--- a/templates/default/redis.init.erb
+++ b/templates/default/redis.init.erb
@@ -18,7 +18,8 @@ REDISNAME=<%= @name %>
 REDISPORT=<%= @port %>
 <% case @platform %>
 <% when 'ubuntu','debian','fedora' %>
-EXEC="su -s /bin/sh -c '<%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/${REDISNAME}.conf' <%= @user %>"
+# EXEC="su -s /bin/sh -c '<%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/${REDISNAME}.conf' <%= @user %>"
+EXEC="SHELL=/bin/sh sudo -s '<%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/${REDISNAME}.conf' <%= @user %>"
 <% else %>
 EXEC="runuser <%= @user %> -c \"<%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/${REDISNAME}.conf\""
 <% end %>
diff --git a/templates/default/redis.upstart.conf.erb b/templates/default/redis.upstart.conf.erb
index 479d0486..782f20cb 100644
--- a/templates/default/redis.upstart.conf.erb
+++ b/templates/default/redis.upstart.conf.erb
@@ -15,5 +15,6 @@ end script
 respawn
 respawn limit 10 30
 
-exec su -s /bin/sh -c 'exec "$0" "$@"' <%= @user %> <%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/<%= @name %>.conf
+# exec su -s /bin/sh -c 'exec "$0" "$@"' <%= @user %> <%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/<%= @name %>.conf
+exec SHELL=/bin/sh sudo -s 'exec "$0" "$@"' <%= @user %> <%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/<%= @name %>.conf
 
diff --git a/templates/default/sentinel.init.erb b/templates/default/sentinel.init.erb
index dfd63016..df746111 100644
--- a/templates/default/sentinel.init.erb
+++ b/templates/default/sentinel.init.erb
@@ -15,7 +15,8 @@
 SENTINELNAME=<%= @name %>
 <% case @platform %>
 <% when 'ubuntu','debian','fedora' %>
-EXEC="su -s /bin/sh -c '<%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/${SENTINELNAME}.conf --sentinel' <%= @user %>"
+# EXEC="su -s /bin/sh -c '<%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/${SENTINELNAME}.conf --sentinel' <%= @user %>"
+EXEC="SHELL=/bin/sh sudo -s '<%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/${SENTINELNAME}.conf --sentinel' <%= @user %>"
 <% else %>
 EXEC="runuser <%= @user %> -c \"<%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/${SENTINELNAME}.conf --sentinel\""
 <% end %>
diff --git a/templates/default/sentinel.upstart.conf.erb b/templates/default/sentinel.upstart.conf.erb
index a9e5fafa..3ed4a598 100644
--- a/templates/default/sentinel.upstart.conf.erb
+++ b/templates/default/sentinel.upstart.conf.erb
@@ -15,5 +15,6 @@ end script
 respawn
 respawn limit 10 30
 
-exec su -s /bin/sh -c 'exec "$0" "$@"' -- <%= @user %> <%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/<%= @name %>.conf --sentinel
+# exec su -s /bin/sh -c 'exec "$0" "$@"' -- <%= @user %> <%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/<%= @name %>.conf --sentinel
+exec SHELL=/bin/sh sudo -s 'exec "$0" "$@"' -- <%= @user %> <%= File.join(@bin_path, 'redis-server') %> <%= @configdir %>/<%= @name %>.conf --sentinel