From b6ec597090b2fb992410efded957b378f895decc Mon Sep 17 00:00:00 2001 From: Kenyon Ralph Date: Wed, 3 Jul 2024 15:39:10 -0700 Subject: [PATCH] systemd service overrides: restore whitespace to pre-conversion When these templates were converted from ERB to EPP in commit 3e101cb3151c3e739cd8541dfbc5329f6ae6b647 (#944), these lines were swapped, causing a whitespace change and unnecessary service restarts. --- .../system/docker.service.d/service-overrides-debian.conf.epp | 4 ++-- .../system/docker.service.d/service-overrides-rhel.conf.epp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp b/templates/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp index c921cc43..b77423a5 100644 --- a/templates/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp +++ b/templates/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp @@ -1,8 +1,8 @@ <% if $service_after_override { -%> [Unit] -After=<%= $service_after_override %> -<% } -%> +After=<%= $service_after_override %> +<% } -%> [Service] EnvironmentFile=-/etc/default/docker EnvironmentFile=-/etc/default/docker-storage diff --git a/templates/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.epp b/templates/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.epp index 4bf078a4..0c0d566f 100644 --- a/templates/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.epp +++ b/templates/etc/systemd/system/docker.service.d/service-overrides-rhel.conf.epp @@ -1,8 +1,8 @@ <% if $service_after_override { -%> [Unit] After=<%= $service_after_override %> -<% } -%> +<% } -%> [Service] EnvironmentFile=-/etc/sysconfig/docker EnvironmentFile=-/etc/sysconfig/docker-storage