X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/90a349e0bc558441e65156eabb585c578d93fbfd..c2ae372eb008748ab79461d80bb1f1725f0f68a4:/cookbooks/systemd/resources/service.rb

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index e7779fae7..c2d125b18 100644
--- 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
 #
-# 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,
@@ -19,7 +19,7 @@
 
 default_action :create
 
-property :name, String
+property :service, String, :name_property => true
 property :description, String, :required => true
 property :after, [String, Array]
 property :wants, [String, Array]
@@ -27,6 +27,11 @@ property :type, String,
          :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
@@ -60,20 +65,20 @@ property :pid_file, String
 action :create do
   service_variables = new_resource.to_hash
 
-  if environment_file.is_a?(Hash)
-    template "/etc/default/#{name}" do
+  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
-      variables :environment => environment_file
+      variables :environment => new_resource.environment_file
     end
 
-    service_variables[:environment_file] = "/etc/default/#{name}"
+    service_variables[:environment_file] = "/etc/default/#{new_resource.service}"
   end
 
-  template "/etc/systemd/system/#{name}.service" do
+  template "/etc/systemd/system/#{new_resource.service}.service" do
     cookbook "systemd"
     source "service.erb"
     owner "root"
@@ -82,30 +87,30 @@ action :create do
     variables service_variables
   end
 
-  execute "systemctl-reload-#{name}.service" do
+  execute "systemctl-reload-#{new_resource.service}.service" do
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
-    subscribes :run, "template[/etc/systemd/system/#{name}.service]"
+    subscribes :run, "template[/etc/systemd/system/#{new_resource.service}.service]"
   end
 end
 
 action :delete do
-  file "/etc/default/#{name}" 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/#{name}.service" do
+  file "/etc/systemd/system/#{new_resource.service}.service" do
     action :delete
   end
 
-  execute "systemctl-reload-#{name}.service" do
+  execute "systemctl-reload-#{new_resource.service}.service" do
     action :nothing
     command "systemctl daemon-reload"
     user "root"
     group "root"
-    subscribes :run, "file[/etc/systemd/system/#{name}.service]"
+    subscribes :run, "file[/etc/systemd/system/#{new_resource.service}.service]"
   end
 end