Merge remote-tracking branch 'github/pull/447'

[chef.git] / cookbooks / systemd / resources / tmpfile.rb

diff --git a/cookbooks/systemd/resources/tmpfile.rb b/cookbooks/systemd/resources/tmpfile.rb
index 070a9cc8db3a7496c3fc30cd87eca74f263489cb..07c39d3a9ccc62908428777f4aa6a5488831e3a4 100644 (file)
--- a/cookbooks/systemd/resources/tmpfile.rb
+++ b/cookbooks/systemd/resources/tmpfile.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: systemd
+# Cookbook:: systemd

 # Resource:: systemd_tmpfile
 #
 # Resource:: systemd_tmpfile
 #

-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, 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,


@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 default_action :create
 

-property :type, String, :required => true
+property :type, String, :required => [:create]

 property :path, String, :name_property => true
 property :mode, String, :default => "-"
 property :owner, String, :default => "-"
 property :path, String, :name_property => true
 property :mode, String, :default => "-"
 property :owner, String, :default => "-"


@@ -33,8 +35,8 @@ action :create do
     source "tmpfile.erb"
     owner "root"
     group "root"
     source "tmpfile.erb"
     owner "root"
     group "root"

-    mode 0o644
-    variables new_resource.to_hash
+    mode "644"
+    variables new_resource.to_hash.merge(:path => new_resource.path)

   end
 
   execute "systemd-tmpfiles" do
   end
 
   execute "systemd-tmpfiles" do