diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml index 22a76c6e..baa8e7da 100644 --- a/.kitchen.dokken.yml +++ b/.kitchen.dokken.yml @@ -10,9 +10,10 @@ transport: provisioner: name: dokken -# TODO: uncomment after converting to inspec -# verifier: -# name: inspec +verifier: + root_path: '/opt/verifier' + # TODO: uncomment after converting to inspec + # name: inspec platforms: - name: amazonlinux 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 d2620be6..4d563f37 100644 --- a/templates/default/sentinel.init.erb +++ b/templates/default/sentinel.init.erb @@ -19,7 +19,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