From c736df16da3df80e8a5fee46fa8074cae09f19cb Mon Sep 17 00:00:00 2001 From: Eric Veiras Galisson Date: Tue, 10 Sep 2019 16:28:23 +0200 Subject: [PATCH] fix: config setup generation --- strongswan/files/default/ipsec.conf.jinja | 2 +- test/integration/default/controls/config_global.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/strongswan/files/default/ipsec.conf.jinja b/strongswan/files/default/ipsec.conf.jinja index b4fa7a0..e3a98de 100644 --- a/strongswan/files/default/ipsec.conf.jinja +++ b/strongswan/files/default/ipsec.conf.jinja @@ -4,7 +4,7 @@ ######################################################################## # basic configuration -conn setup +config setup {%- for k, v in salt['pillar.get']('strongswan:config', {}).items() %} {{ k }}={{ v }} {%- endfor %} diff --git a/test/integration/default/controls/config_global.rb b/test/integration/default/controls/config_global.rb index a7dd8dc..348e791 100644 --- a/test/integration/default/controls/config_global.rb +++ b/test/integration/default/controls/config_global.rb @@ -6,7 +6,7 @@ it { should be_owned_by 'root' } it { should be_grouped_into 'root' } its('mode') { should cmp '0644' } - its('content') { should include 'conn setup' } + its('content') { should include 'config setup' } its('content') { should include ' strictcrlpolicy=yes' } its('content') { should include ' uniqueids=no' } its('content') { should include 'conn %default' }