dhcp: Only use first ntp server in DHCP replies

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 62641291ad606d601c4d2e23e50405bdbe9067b7..c2d125b1884a3adccabdcb8daf54f153b46b70d5 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.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
 #
 # 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,


@@ -27,6 +27,11 @@ property :type, String,
          :default => "simple",
          :is => %w[simple forking oneshot dbus notify idle]
 property :limit_nofile, Integer
          :default => "simple",
          :is => %w[simple forking oneshot dbus notify idle]
 property :limit_nofile, Integer

+property :limit_as, [Integer, String]
+property :limit_cpu, [Integer, String]
+property :memory_low, [Integer, String]
+property :memory_high, [Integer, String]
+property :memory_max, [Integer, String]

 property :environment, Hash, :default => {}
 property :environment_file, [String, Hash]
 property :user, String
 property :environment, Hash, :default => {}
 property :environment_file, [String, Hash]
 property :user, String


@@ -60,14 +65,14 @@ property :pid_file, String
 action :create do
   service_variables = new_resource.to_hash
 
 action :create do
   service_variables = new_resource.to_hash
 

-  if environment_file.is_a?(Hash)
+  if new_resource.environment_file.is_a?(Hash)

     template "/etc/default/#{new_resource.service}" do
       cookbook "systemd"
       source "environment.erb"
       owner "root"
       group "root"
       mode 0o640
     template "/etc/default/#{new_resource.service}" do
       cookbook "systemd"
       source "environment.erb"
       owner "root"
       group "root"
       mode 0o640

-      variables :environment => environment_file
+      variables :environment => new_resource.environment_file

     end
 
     service_variables[:environment_file] = "/etc/default/#{new_resource.service}"
     end
 
     service_variables[:environment_file] = "/etc/default/#{new_resource.service}"


@@ -94,7 +99,7 @@ end
 action :delete do
   file "/etc/default/#{new_resource.service}" do
     action :delete
 action :delete do
   file "/etc/default/#{new_resource.service}" do
     action :delete

-    only_if { environment_file.is_a?(Hash) }
+    only_if { new_resource.environment_file.is_a?(Hash) }

   end
 
   file "/etc/systemd/system/#{new_resource.service}.service" do
   end
 
   file "/etc/systemd/system/#{new_resource.service}.service" do