Add tests for web cookbook

[chef.git] / cookbooks / web / recipes / base.rb

diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index 6b70cb702e721407a5277a5c5faf6a2aeb7e1e67..450b35138a75b7cd77935b06efc4b26df7367ecd 100644 (file)
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: web
+# Cookbook:: web

 # Recipe:: base
 #
 # Recipe:: base
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -22,6 +22,7 @@ node.default[:nfs]["/store/rails"] = {
   :path => "/store/rails"
 }
 
   :path => "/store/rails"
 }
 

+include_recipe "accounts"

 include_recipe "nfs"
 
 directory node[:web][:base_directory] do
 include_recipe "nfs"
 
 directory node[:web][:base_directory] do


@@ -29,10 +30,11 @@ directory node[:web][:base_directory] do
   mode 0o2775
 end
 
   mode 0o2775
 end
 

-directory node[:web][:pid_directory] do
+systemd_tmpfile node[:web][:pid_directory] do
+  type "d"

   owner "rails"
   group "rails"
   owner "rails"
   group "rails"

-  mode 0o775
+  mode "0755"

 end
 
 directory node[:web][:log_directory] do
 end
 
 directory node[:web][:log_directory] do