imagery: remove old cleanup code

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

diff --git a/cookbooks/systemd/resources/path.rb b/cookbooks/systemd/resources/path.rb
index 115ee9f6e47211c00fcf1f0bf589f7c52f8ff679..52f5576c6a86fa4f979505f4e8c5f71045bdcbbd 100644 (file)
--- a/cookbooks/systemd/resources/path.rb
+++ b/cookbooks/systemd/resources/path.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: systemd
+# Cookbook:: systemd
 # Resource:: systemd_path
 #
-# Copyright 2017, OpenStreetMap Foundation
+# Copyright:: 2017, 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
 #
-# 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,10 +17,12 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :path, String, :name_property => true
-property :description, String, :required => true
+property :description, String, :required => [:create]
 property :after, [String, Array]
 property :wants, [String, Array]
 property :path_exists, [String, Array]
@@ -29,40 +31,40 @@ property :path_changed, [String, Array]
 property :path_modified, [String, Array]
 property :directory_not_empty, [String, Array]
 property :unit, String
-property :make_directory, [TrueClass, FalseClass]
+property :make_directory, [true, false]
 property :directory_mode, Integer
 
 action :create do
   path_variables = new_resource.to_hash
 
-  template "/etc/systemd/system/#{path}.path" do
+  template "/etc/systemd/system/#{new_resource.path}.path" do
     cookbook "systemd"
     source "path.erb"
     owner "root"
     group "root"
-    mode 0o644
+    mode "644"
     variables path_variables
   end
 
-  execute "systemctl-reload-#{path}.path" do
+  execute "systemctl-reload-#{new_resource.path}.path" do
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
-    subscribes :run, "template[/etc/systemd/system/#{path}.path]"
+    subscribes :run, "template[/etc/systemd/system/#{new_resource.path}.path]"
   end
 end
 
 action :delete do
-  file "/etc/systemd/system/#{path}.path" do
+  file "/etc/systemd/system/#{new_resource.path}.path" do
     action :delete
   end
 
-  execute "systemctl-reload-#{path}.path" do
+  execute "systemctl-reload-#{new_resource.path}.path" do
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
-    subscribes :run, "file[/etc/systemd/system/#{path}.path]"
+    subscribes :run, "file[/etc/systemd/system/#{new_resource.path}.path]"
   end
 end