Don't daemonise when initialising cache directories

[chef.git] / cookbooks / squid / resources / fragment.rb

diff --git a/cookbooks/squid/resources/fragment.rb b/cookbooks/squid/resources/fragment.rb
index 60e2a8282a87021d2686c8aeea79656028ac1daa..0f55aa236bc51719bfe7a5cf26cbd6a149ec2f73 100644 (file)
--- a/cookbooks/squid/resources/fragment.rb
+++ b/cookbooks/squid/resources/fragment.rb
@@ -8,7 +8,7 @@
 # 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,
@@ -17,13 +17,33 @@
 # limitations under the License.
 #
 
-actions :create, :delete
 default_action :create
 
-attribute :name, :kind_of => String, :name_attribute => true
-attribute :directory, :kind_of => String
-attribute :template, :kind_of => String, :required => true
-attribute :variables, :kind_of => Hash, :default => {}
+property :fragment, :kind_of => String, :name_attribute => true
+property :template, :kind_of => String, :required => true
+property :variables, :kind_of => Hash, :default => {}
+
+action :create do
+  declare_resource :template, fragment_path do
+    source new_resource.template
+    owner "root"
+    group "root"
+    mode 0o644
+    variables new_resource.variables
+  end
+end
+
+action :delete do
+  file fragment_path do
+    action :delete
+  end
+end
+
+action_class do
+  def fragment_path
+    "/etc/squid/squid.conf.d/#{new_resource.fragment}.conf"
+  end
+end
 
 def after_created
   notifies :create, "template[/etc/squid/squid.conf]"