Revert "Use callout verification for domains we are relaying to"

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

diff --git a/cookbooks/systemd/resources/timer.rb b/cookbooks/systemd/resources/timer.rb
index 7dc4cab6544a69b8be0dbd93c660e0d39166a9cf..f3f324ea035cd2fbf3f95cf86804bb1db96bd4ca 100644 (file)
--- a/cookbooks/systemd/resources/timer.rb
+++ b/cookbooks/systemd/resources/timer.rb
@@ -17,10 +17,13 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 property :timer, String, :name_property => true
 default_action :create
 
 property :timer, String, :name_property => true

-property :description, String, :required => [:create]
+property :dropin, String
+property :description, String

 property :after, [String, Array]
 property :wants, [String, Array]
 property :on_active_sec, [Integer, String]
 property :after, [String, Array]
 property :wants, [String, Array]
 property :on_active_sec, [Integer, String]


@@ -39,26 +42,34 @@ property :remain_after_elapse, [true, false]
 action :create do
   timer_variables = new_resource.to_hash
 
 action :create do
   timer_variables = new_resource.to_hash
 

-  template "/etc/systemd/system/#{new_resource.timer}.timer" do
+  if new_resource.dropin
+    directory dropin_directory do
+      owner "root"
+      group "root"
+      mode "755"
+    end
+  end
+
+  template config_name do

     cookbook "systemd"
     source "timer.erb"
     owner "root"
     group "root"
     mode "644"
     variables timer_variables
     cookbook "systemd"
     source "timer.erb"
     owner "root"
     group "root"
     mode "644"
     variables timer_variables

+    notifies :run, "execute[systemctl-reload]"

   end
 
   end
 

-  execute "systemctl-reload-#{new_resource.timer}.timer" do
+  execute "systemctl-reload" do

     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"

-    subscribes :run, "template[/etc/systemd/system/#{new_resource.timer}.timer]"

   end
 end
 
 action :delete do
   end
 end
 
 action :delete do

-  file "/etc/systemd/system/#{new_resource.timer}.timer" do
+  file config_name do

     action :delete
   end
 
     action :delete
   end
 


@@ -70,3 +81,17 @@ action :delete do
     subscribes :run, "file[/etc/systemd/system/#{new_resource.timer}.timer]"
   end
 end
     subscribes :run, "file[/etc/systemd/system/#{new_resource.timer}.timer]"
   end
 end

+
+action_class do
+  def dropin_directory
+    "/etc/systemd/system/#{new_resource.timer}.timer.d"
+  end
+
+  def config_name
+    if new_resource.dropin
+      "#{dropin_directory}/#{new_resource.dropin}.conf"
+    else
+      "/etc/systemd/system/#{new_resource.timer}.timer"
+    end
+  end
+end