From 13680be4dcbf71fbef5b098f609ecd2226f0d862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Mon, 8 Jan 2024 08:38:02 -1000 Subject: [PATCH] Avoid spacing changes after switching to EPP In #944, we switched from ERB to EPP. This has not been released yet, but while testing I spotted some white space changes that where unexpected. Adjust the code so that the EPP template produce the same result as the ERB template did, making changes more relevant to end-users if they see some files being changed. --- .../system/docker.service.d/service-overrides-debian.conf.epp | 2 +- .../system/docker.service.d/service-overrides-rhel.conf.epp | 2 +- 2 files changed, 2 insertions(+), 2 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..62d11ce2 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 %> -<% } -%> +<% } -%> [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