Drop extra whitespaces from jinja macros

ComplianceAsCode · Jun 25, 2023 · 4f9a9de · 4f9a9de
1 parent 6ae1e6e
commit 4f9a9de
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/ansible/shared.yml b/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/ansible/shared.yml
@@ -5,12 +5,12 @@
 # disruption = medium
 {{{ ansible_instantiate_variables("login_banner_text") }}}
 
-{{% if product not in ['sle15'] %}}
+{{%- if product not in ['sle15'] -%}}
 - name: "{{{ rule_title }}} - Ensure Correct Banner"
   copy:
     dest: /etc/issue
     content: '{{{ ansible_deregexify_banner_etc_issue("login_banner_text") }}}'
-{{% else %}}
+{{%- else -%}}
 - name: {{{ rule_title }}} Ensure issue-generator is Installed
   package:
     name: "issue-generator"
@@ -27,4 +27,4 @@
     enabled: "yes"
     state: "restarted"
     masked: "no"
-{{% endif %}}
+{{%- endif -%}}
diff --git a/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/bash/shared.sh b/linux_os/guide/system/accounts/accounts-banners/banner_etc_issue/bash/shared.sh
@@ -16,14 +16,14 @@
 {{{ bash_deregexify_banner_backslash("login_banner_text") }}}
 formatted=$(echo "$login_banner_text" | fold -sw 80)
 
-{{% if product not in ['sle15'] %}}
+{{%- if product not in ['sle15'] -%}}
 cat <<EOF >/etc/issue
 $formatted
 EOF
-{{% else %}}
+{{%- else -%}}
 {{{ bash_package_install("issue-generator") }}}
 cat <<EOF >/etc/issue.d/99-oscap-setting
 $formatted
 EOF
 {{{ bash_service_command("restart", "issue-generator") }}}
-{{% endif %}}
+{{%- endif -%}}
diff --git a/linux_os/guide/system/accounts/accounts-banners/file_groupowner_etc_issue/rule.yml b/linux_os/guide/system/accounts/accounts-banners/file_groupowner_etc_issue/rule.yml
@@ -39,19 +39,18 @@ ocil_clause: '{{{ ocil_clause_file_group_owner(file="/etc/issue", group="root")
 ocil: |-
     {{{ ocil_file_group_owner(file="/etc/issue", group="root") }}}
 
-{{% if product in ['sle15'] %}}
+{{%- if product in ['sle15'] -%}}
 template:
     name: file_groupowner
     vars:
         filepath: /etc/issue.d/
         filegid: '0'
         file_regex: ^.*$
         recursive: 'true'
-{{% else %}}
+{{%- else -%}}
 template:
     name: file_groupowner
     vars:
         filepath: /etc/issue
         gid_or_name: '0'
 {{% endif %}}
-
diff --git a/linux_os/guide/system/accounts/accounts-banners/file_owner_etc_issue/rule.yml b/linux_os/guide/system/accounts/accounts-banners/file_owner_etc_issue/rule.yml
@@ -39,19 +39,18 @@ ocil_clause: '{{{ ocil_clause_file_owner(file="/etc/issue", owner="root") }}}'
 ocil: |-
     {{{ ocil_file_owner(file="/etc/issue", owner="root") }}}
 
-{{% if product in ['sle15'] %}}
+{{%- if product in ['sle15'] -%}}
 template:
     name: file_owner
     vars:
         filepath: /etc/issue.d/
         fileuid: '0'
         file_regex: ^.*$
         recursive: 'true'
-{{% else %}}
+{{%- else -%}}
 template:
     name: file_owner
     vars:
         filepath: /etc/issue
         fileuid: '0'
-{{% endif %}}
-
+{{%- endif -%}}