feat(pillar): accept 'true'/True/true for booleans in pillars

saltstack-formulas · Oct 6, 2019 · afe3e70 · afe3e70
1 parent c506dcf
commit afe3e70
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/exim/defaults.yaml b/exim/defaults.yaml
@@ -7,16 +7,16 @@ exim:
   virtual_aliases: {}
   files: {}
   config:
-    configtype: 'satellite'
+    configtype: satellite
     other_hostnames: ''
     local_interfaces: ''
     relay_domains: ''
     relay_nets: ''
-    use_split_config: 'true'
-    hide_mailname: 'true'
-    ue4c_keepcomments: 'true'
-    localdelivery: 'mail_spool'
-    minimaldns: 'false'
+    use_split_config: true
+    hide_mailname: true
+    ue4c_keepcomments: true
+    localdelivery: mail_spool
+    minimaldns: false
     readhost: ''
     smarthost: ''
     cfilemode: '644'

diff --git a/exim/files/default/update-exim4.conf.conf b/exim/files/default/update-exim4.conf.conf
@@ -8,11 +8,11 @@ dc_other_hostnames='{{ exim.other_hostnames }}'
 dc_local_interfaces='{{ exim.local_interfaces }}'
 dc_relay_domains='{{ exim.relay_domains }}'
 dc_relay_nets='{{ exim.relay_nets }}'
-dc_use_split_config='{{ exim.use_split_config }}'
-dc_hide_mailname='{{ exim.hide_mailname }}'
-ue4c_keepcomments='{{ exim.ue4c_keepcomments }}'
+dc_use_split_config='{{ exim.use_split_config | lower }}'
+dc_hide_mailname='{{ exim.hide_mailname | lower }}'
+ue4c_keepcomments='{{ exim.ue4c_keepcomments | lower }}'
 dc_localdelivery='{{ exim.localdelivery }}'
-dc_minimaldns='{{ exim.minimaldns }}'
+dc_minimaldns='{{ exim.minimaldns | lower }}'
 dc_readhost='{{ exim.readhost }}'
 dc_smarthost='{{ exim.smarthost }}'
 CFILEMODE='{{ exim.cfilemode }}'
diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb
@@ -7,6 +7,7 @@
 
     # Custom config
     its('content') { should include "dc_hide_mailname='false'" }
+    its('content') { should include "dc_use_split_config='false'" }
   end
 
   describe file('/etc/mailname') do

diff --git a/test/salt/pillar/exim.sls b/test/salt/pillar/exim.sls
@@ -3,8 +3,9 @@
 ---
 exim:
   config:
-    configtype: 'satellite'
+    configtype: satellite
     hide_mailname: 'false'
+    use_split_config: false
   mailname: foo.bar.baz
   aliases:
     root: root@bar.baz