diff --git a/templates/etc/systemd/system/docker-run.erb b/templates/etc/systemd/system/docker-run.erb index aeaf280..ebd949f 100644 --- a/templates/etc/systemd/system/docker-run.erb +++ b/templates/etc/systemd/system/docker-run.erb @@ -1,35 +1,35 @@ <%- depend_services = @depend_services_array.map{|s| s =~ /\.[a-z]+$/ ? s : "#{s}.service"} @after = [@service_name.nil? ? "" : "#@service_name.service"] + @sanitised_after_array.map{ |s| "#{@service_prefix}#{s}.service"} + @sanitised_depends_array.map{ |s| "#{@service_prefix}#{s}.service"} + depend_services @wants = @sanitised_after_array.map{ |a| "#{@service_prefix}#{a}.service"} @requires = [@service_name.nil? ? "" : "#@service_name.service"] + @sanitised_depends_array.map{ |d| "#{@service_prefix}#{d}.service"} + depend_services -%> # This file is managed by Puppet and local changes # may be overwritten [Unit] Description=Daemon for <%= @title %> After=<%= @after.uniq.join(" ") %> Wants=<%= @wants.uniq.join(" ") %> Requires=<%= @requires.uniq.join(" ") %> +StartLimitIntervalSec=20 +StartLimitBurst=5 [Service] Restart=<%= @systemd_restart %> -StartLimitInterval=20 -StartLimitBurst=5 TimeoutStartSec=0 RestartSec=5 Environment="HOME=/root" <%- if @_syslog_identifier -%> SyslogIdentifier=<%= @_syslog_identifier %> <%- end -%> ExecStart=/usr/local/bin/docker-run-<%= @sanitised_title %>-start.sh ExecStop=-/usr/local/bin/docker-run-<%= @sanitised_title %>-stop.sh [Install] WantedBy=multi-user.target