Merge pull request #116 from vladgh/115-template

Fix whitespace in template, as per https://jinja.palletsprojects.com/en/3.1.x/templates/#whitespace-control
vladgh · Nov 3, 2023 · f9488c6 · f9488c6
2 parents 52eb827 + 952b45c
commit f9488c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -18,6 +18,7 @@
       vars:
         samba_netbios_name: NAS
         samba_server_string: NAS
+        samba_realm: EXAMPLE.COM
         samba_workgroup: WORKGROUP
         samba_global_include: global-include.conf
         samba_load_homes: true

diff --git a/roles/server/templates/smb.conf.j2 b/roles/server/templates/smb.conf.j2
@@ -2,15 +2,13 @@
 
 [global]
   # Server information
-  netbios name = {% if samba_netbios_name is defined and samba_netbios_name %}{{ samba_netbios_name }}{% else %}{{ ansible_hostname }}{% endif %}
-  mdns name = {% if samba_mdns_name is defined and samba_mdns_name %}{{ samba_mdns_name }}{% else %}netbios{% endif %}
-
+  netbios name = {% if samba_netbios_name is defined and samba_netbios_name %}{{ samba_netbios_name }}{% else %}{{ ansible_hostname }}{% endif +%}
+  mdns name = {% if samba_mdns_name is defined and samba_mdns_name %}{{ samba_mdns_name }}{% else %}netbios{% endif +%}
   workgroup = {{ samba_workgroup }}
 {% if samba_realm is defined and samba_realm %}
   realm = {{ samba_realm }}
 {% endif %}
   server string = {{ samba_server_string }}
-
 {% if samba_apple_extensions is defined and samba_apple_extensions | bool %}
   fruit:aapl = yes
 {% endif %}