From c70dd01bb2c0492e5e6d9ebbc9980dd7c81abbbc Mon Sep 17 00:00:00 2001
From: Fabian Foerg <3429782+faf0@users.noreply.github.com>
Date: Wed, 12 Dec 2018 22:07:29 -0800
Subject: [PATCH] Simplify Apple Profile Configuration Template

---
 roles/strongswan/templates/mobileconfig.j2 | 28 ++++++++++------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/roles/strongswan/templates/mobileconfig.j2 b/roles/strongswan/templates/mobileconfig.j2
index e9d66701..3a6b6e32 100644
--- a/roles/strongswan/templates/mobileconfig.j2
+++ b/roles/strongswan/templates/mobileconfig.j2
@@ -7,13 +7,13 @@
         <dict>
             <key>IKEv2</key>
             <dict>
-{% if algo_ondemand_wifi or algo_ondemand_cellular %}
+{%- if algo_ondemand_wifi or algo_ondemand_cellular %}
               <key>OnDemandEnabled</key>
                 <integer>1</integer>
               <key>OnDemandRules</key>
               <array>
-{% if algo_ondemand_wifi_exclude|b64decode != '_null' %}
-{% set WIFI_EXCLUDE_LIST = (algo_ondemand_wifi_exclude|b64decode|string).split(',') %}
+  {%- if algo_ondemand_wifi_exclude|b64decode != '_null' %}
+    {%- set WIFI_EXCLUDE_LIST = (algo_ondemand_wifi_exclude|b64decode|string).split(',') %}
                   <dict>
                       <key>Action</key>
                       <string>Disconnect</string>
@@ -21,20 +21,19 @@
                       <string>WiFi</string>
                       <key>SSIDMatch</key>
                       <array>
-{% for network_name in WIFI_EXCLUDE_LIST %}
+    {%- for network_name in WIFI_EXCLUDE_LIST %}
                           <string>{{ network_name|e }}</string>
-{% endfor %}
+    {%- endfor %}
                       </array>
                   </dict>
-{% else %}
-{% endif %}
+  {%- endif %}
                   <dict>
                     <key>Action</key>
-{% if algo_ondemand_wifi %}
+  {%- if algo_ondemand_wifi %}
                       <string>Connect</string>
-  {% else %}
+  {%- else %}
                       <string>Disconnect</string>
-{% endif %}
+  {%- endif %}
                     <key>InterfaceTypeMatch</key>
                       <string>WiFi</string>
                     <key>URLStringProbe</key>
@@ -42,11 +41,11 @@
                   </dict>
                   <dict>
                     <key>Action</key>
-{% if algo_ondemand_cellular %}
+  {%- if algo_ondemand_cellular %}
                       <string>Connect</string>
-  {% else %}
+  {%- else %}
                       <string>Disconnect</string>
-{% endif %}
+  {%- endif %}
                     <key>InterfaceTypeMatch</key>
                       <string>Cellular</string>
                     <key>URLStringProbe</key>
@@ -57,8 +56,7 @@
                       <string>Disconnect</string>
                   </dict>
                 </array>
-{% else %}
-{% endif %}
+{%- endif %}
                 <key>AuthenticationMethod</key>
                 <string>Certificate</string>
                 <key>ChildSecurityAssociationParameters</key>