Exempt /server-status from redirection

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

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index 43d93785330cc01cbf9137edc337217cdf523945..d3e2cac74cff15184b97fee69591817a9c5210b0 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -19,70 +19,93 @@
 
 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]
 property :type, String,
          :default => "simple",
-         :is => %w(simple forking oneshot dbus notify idle)
-property :limit_nofile, Fixnum
+         :is => %w[simple forking oneshot dbus notify idle]
+property :limit_nofile, Integer
 property :environment, Hash, :default => {}
-property :environment_file, String
+property :environment_file, [String, Hash]
 property :user, String
 property :group, String
+property :working_directory, String
 property :exec_start_pre, String
 property :exec_start, String, :required => true
 property :exec_start_post, String
 property :exec_stop, String
 property :exec_reload, String
 property :runtime_directory, String
-property :runtime_directory_mode, Fixnum
+property :runtime_directory_mode, Integer
 property :standard_input, String,
-         :is => %w(null tty tty-force tty-fail socket)
+         :is => %w[null tty tty-force tty-fail socket]
 property :standard_output, String,
-         :is => %w(inherit null tty journal syslog kmsg journal+console syslog+console kmsg+console socket)
+         :is => %w[inherit null tty journal syslog kmsg journal+console syslog+console kmsg+console socket]
 property :standard_error, String,
-         :is => %w(inherit null tty journal syslog kmsg journal+console syslog+console kmsg+console socket)
+         :is => %w[inherit null tty journal syslog kmsg journal+console syslog+console kmsg+console socket]
+property :success_exit_status, [Integer, String, Array]
 property :restart, String,
-         :is => %w(on-success on-failure on-abnormal on-watchdog on-abort always)
+         :is => %w[on-success on-failure on-abnormal on-watchdog on-abort always]
 property :private_tmp, [TrueClass, FalseClass]
 property :private_devices, [TrueClass, FalseClass]
 property :private_network, [TrueClass, FalseClass]
 property :protect_system, [TrueClass, FalseClass, String]
 property :protect_home, [TrueClass, FalseClass, String]
-property :timeout_sec, Fixnum
+property :no_new_privileges, [TrueClass, FalseClass]
+property :timeout_sec, Integer
 property :pid_file, String
 
 action :create do
-  template "/etc/systemd/system/#{name}.service" do
+  service_variables = new_resource.to_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
+      variables :environment => new_resource.environment_file
+    end
+
+    service_variables[:environment_file] = "/etc/default/#{new_resource.service}"
+  end
+
+  template "/etc/systemd/system/#{new_resource.service}.service" do
     cookbook "systemd"
     source "service.erb"
     owner "root"
     group "root"
     mode 0o644
-    variables new_resource.to_hash
+    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/systemd/system/#{name}.service" do
+  file "/etc/default/#{new_resource.service}" do
+    action :delete
+    only_if { environment_file.is_a?(Hash) }
+  end
+
+  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