From 13c4628b5d553bbccf8be6b1aca1d1e5a9e8f805 Mon Sep 17 00:00:00 2001
From: Fabian Foerg <3429782+faf0@users.noreply.github.com>
Date: Tue, 19 Mar 2019 09:49:18 -0700
Subject: [PATCH] Simplify Apple Profile Configuration Template (#1033)

* Simplify Apple Profile Configuration Template

* enable lstrip_blocks

* remove ldashes
---
 roles/strongswan/templates/mobileconfig.j2 | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/roles/strongswan/templates/mobileconfig.j2 b/roles/strongswan/templates/mobileconfig.j2
index e9d6670..6cf0ea1 100644
--- a/roles/strongswan/templates/mobileconfig.j2
+++ b/roles/strongswan/templates/mobileconfig.j2
@@ -1,3 +1,4 @@
+#jinja2:lstrip_blocks: True
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -12,8 +13,8 @@
                 <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 +22,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 %}
                       <string>Disconnect</string>
-{% endif %}
+  {% endif %}
                     <key>InterfaceTypeMatch</key>
                       <string>WiFi</string>
                     <key>URLStringProbe</key>
@@ -42,11 +42,11 @@
                   </dict>
                   <dict>
                     <key>Action</key>
-{% if algo_ondemand_cellular %}
+  {% if algo_ondemand_cellular %}
                       <string>Connect</string>
   {% else %}
                       <string>Disconnect</string>
-{% endif %}
+  {% endif %}
                     <key>InterfaceTypeMatch</key>
                       <string>Cellular</string>
                     <key>URLStringProbe</key>
@@ -57,7 +57,6 @@
                       <string>Disconnect</string>
                   </dict>
                 </array>
-{% else %}
 {% endif %}
                 <key>AuthenticationMethod</key>
                 <string>Certificate</string>