diff --git a/cookbooks/nginx/definitions/nginx_vhost.rb b/cookbooks/nginx/definitions/nginx_vhost.rb index e59a93c..142ac47 100644 --- a/cookbooks/nginx/definitions/nginx_vhost.rb +++ b/cookbooks/nginx/definitions/nginx_vhost.rb @@ -77,6 +77,7 @@ template "/etc/nginx/sites-enabled/#{vhost_sym.to_s}.conf" do source nginx_vhost_params[:options][:source] || "#{vhost_sym.to_s}.conf.erb" + cookbook nginx_vhost_params[:options][:cookbook].to_s if nginx_vhost_params[:options][:cookbook] mode '0644' variables({ :listen => nginx_listen + auth, diff --git a/cookbooks/redis/recipes/default.rb b/cookbooks/redis/recipes/default.rb index 4d2ce8c..b712f15 100644 --- a/cookbooks/redis/recipes/default.rb +++ b/cookbooks/redis/recipes/default.rb @@ -50,7 +50,9 @@ else - package "redis-server" + package "redis-server" do + options node.redis.redis_package_options if node.redis[:redis_package_options] + end end