From 11642ebb81a244e84a167a4039ca79fe4dde4422 Mon Sep 17 00:00:00 2001 From: Christopher Bowman Date: Mon, 8 Aug 2022 12:52:58 -0400 Subject: [PATCH] Add missing extra_systemd_parameters values to docker-run.erb --- spec/defines/run_spec.rb | 20 ++++++++++++++++++++ templates/etc/systemd/system/docker-run.erb | 15 +++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/spec/defines/run_spec.rb b/spec/defines/run_spec.rb index fec46d58..7ad703a7 100644 --- a/spec/defines/run_spec.rb +++ b/spec/defines/run_spec.rb @@ -200,6 +200,26 @@ 'when passing syslog_facility' => { 'syslog_facility' => 'user', }, + 'when passing serveral extra systemd parameters' => { + 'extra_systemd_parameters' => { + 'Service' => { + 'TimeoutStopSec' => '120', + }, + 'Unit' => { + 'Documentation' => 'https://example.com/' + }, + 'Install' => { + 'Alias' => 'example2', + }, + } + }, + 'when passing an extra systemd parameter' => { + 'extra_systemd_parameters' => { + 'Service' => { + 'TimeoutStopSec' => '120', + } + } + }, } describe 'docker::run', type: :define do diff --git a/templates/etc/systemd/system/docker-run.erb b/templates/etc/systemd/system/docker-run.erb index 85586f35..916063e2 100644 --- a/templates/etc/systemd/system/docker-run.erb +++ b/templates/etc/systemd/system/docker-run.erb @@ -19,6 +19,11 @@ Requires=<%= @requires.uniq.join(" ") %> StartLimitIntervalSec=20 StartLimitBurst=3 <%- end -%> +<%- if @extra_systemd_parameters['Unit'] -%> +<%- @extra_systemd_parameters['Unit'].each do |key,value| -%> +<%= key %>=<%= value %> +<%- end -%> +<%- end -%> [Service] Restart=<%= @systemd_restart %> @@ -40,9 +45,19 @@ ExecStop=-/usr/local/bin/docker-run-<%= @sanitised_title %>-stop.sh <%- if @remain_after_exit %> RemainAfterExit=<%= @remain_after_exit %> <%- end -%> +<%- if @extra_systemd_parameters['Service'] -%> +<%- @extra_systemd_parameters['Service'].each do |key,value| -%> +<%= key %>=<%= value %> +<%- end -%> +<%- end -%> [Install] WantedBy=multi-user.target <%- if @service_name -%> WantedBy=<%= @service_name %>.service <%- end -%> +<%- if @extra_systemd_parameters['Install'] -%> +<%- @extra_systemd_parameters['Install'].each do |key,value| -%> +<%= key %>=<%= value %> +<%- end -%> +<%- end -%>