From 762128f48e08b54d190631f7c0784c0733897fcb Mon Sep 17 00:00:00 2001
From: Markus Krogh <markus@nordu.net>
Date: Tue, 12 Jun 2018 14:16:57 +0200
Subject: Move and delist eduroam config

---
 src/apps/changepw/eduroam.mobileconfig | 68 ----------------------------------
 templates/eduroam.mobileconfig         | 68 ++++++++++++++++++++++++++++++++++
 templates/index.html                   |  3 --
 3 files changed, 68 insertions(+), 71 deletions(-)
 delete mode 100644 src/apps/changepw/eduroam.mobileconfig
 create mode 100644 templates/eduroam.mobileconfig

diff --git a/src/apps/changepw/eduroam.mobileconfig b/src/apps/changepw/eduroam.mobileconfig
deleted file mode 100644
index 952c924..0000000
--- a/src/apps/changepw/eduroam.mobileconfig
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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">
-<dict>
-    <key>PayloadContent</key>
-    <array>
-        <dict>
-            <key>EAPClientConfiguration</key>
-            <dict>
-                <key>AcceptEAPTypes</key>
-                <array>
-                    <integer>25</integer>
-                </array>
-                <key>EAPFASTProvisionPAC</key>
-                <false/>
-                <key>EAPFASTProvisionPACAnonymously</key>
-                <false/>
-                <key>EAPFASTUsePAC</key>
-                <false/>
-                <key>OuterIdentity</key>
-                <string>nordu-user@nordu.net</string>
-                <key>TLSAllowTrustExceptions</key>
-                <true/>
-                <key>TLSTrustedServerNames</key>
-                <array>
-                    <string>eduroam1.nordu.net</string>
-                </array>
-                <key>UserName</key>
-                <string>eduroam-user</string>
-            </dict>
-            <key>EncryptionType</key>
-            <string>WPA</string>
-            <key>HIDDEN_NETWORK</key>
-            <false/>
-            <key>PayloadDescription</key>
-            <string>Configures wireless connectivity settings.</string>
-            <key>PayloadDisplayName</key>
-            <string>Wi-Fi (eduroam)</string>
-            <key>PayloadIdentifier</key>
-            <string>net.nordu.iphone.profile.wifi</string>
-            <key>PayloadOrganization</key>
-            <string>NORDUnet</string>
-            <key>PayloadType</key>
-            <string>com.apple.wifi.managed</string>
-            <key>PayloadUUID</key>
-            <string>63622959-0DCB-413A-9C3C-515833E38891</string>
-            <key>PayloadVersion</key>
-            <integer>1</integer>
-            <key>SSID_STR</key>
-            <string>eduroam</string>
-        </dict>
-    </array>
-    <key>PayloadDescription</key>
-    <string>Configuration for eduroam at NORDUnet</string>
-    <key>PayloadDisplayName</key>
-    <string>Eduroam Profile</string>
-    <key>PayloadIdentifier</key>
-    <string>net.nordu.iphone.profile</string>
-    <key>PayloadOrganization</key>
-    <string>NORDUnet</string>
-    <key>PayloadType</key>
-    <string>Configuration</string>
-    <key>PayloadUUID</key>
-    <string>4AD09534-1BC6-41CA-BC88-56149799781B</string>
-    <key>PayloadVersion</key>
-    <integer>1</integer>
-</dict>
-</plist>
diff --git a/templates/eduroam.mobileconfig b/templates/eduroam.mobileconfig
new file mode 100644
index 0000000..952c924
--- /dev/null
+++ b/templates/eduroam.mobileconfig
@@ -0,0 +1,68 @@
+<?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">
+<dict>
+    <key>PayloadContent</key>
+    <array>
+        <dict>
+            <key>EAPClientConfiguration</key>
+            <dict>
+                <key>AcceptEAPTypes</key>
+                <array>
+                    <integer>25</integer>
+                </array>
+                <key>EAPFASTProvisionPAC</key>
+                <false/>
+                <key>EAPFASTProvisionPACAnonymously</key>
+                <false/>
+                <key>EAPFASTUsePAC</key>
+                <false/>
+                <key>OuterIdentity</key>
+                <string>nordu-user@nordu.net</string>
+                <key>TLSAllowTrustExceptions</key>
+                <true/>
+                <key>TLSTrustedServerNames</key>
+                <array>
+                    <string>eduroam1.nordu.net</string>
+                </array>
+                <key>UserName</key>
+                <string>eduroam-user</string>
+            </dict>
+            <key>EncryptionType</key>
+            <string>WPA</string>
+            <key>HIDDEN_NETWORK</key>
+            <false/>
+            <key>PayloadDescription</key>
+            <string>Configures wireless connectivity settings.</string>
+            <key>PayloadDisplayName</key>
+            <string>Wi-Fi (eduroam)</string>
+            <key>PayloadIdentifier</key>
+            <string>net.nordu.iphone.profile.wifi</string>
+            <key>PayloadOrganization</key>
+            <string>NORDUnet</string>
+            <key>PayloadType</key>
+            <string>com.apple.wifi.managed</string>
+            <key>PayloadUUID</key>
+            <string>63622959-0DCB-413A-9C3C-515833E38891</string>
+            <key>PayloadVersion</key>
+            <integer>1</integer>
+            <key>SSID_STR</key>
+            <string>eduroam</string>
+        </dict>
+    </array>
+    <key>PayloadDescription</key>
+    <string>Configuration for eduroam at NORDUnet</string>
+    <key>PayloadDisplayName</key>
+    <string>Eduroam Profile</string>
+    <key>PayloadIdentifier</key>
+    <string>net.nordu.iphone.profile</string>
+    <key>PayloadOrganization</key>
+    <string>NORDUnet</string>
+    <key>PayloadType</key>
+    <string>Configuration</string>
+    <key>PayloadUUID</key>
+    <string>4AD09534-1BC6-41CA-BC88-56149799781B</string>
+    <key>PayloadVersion</key>
+    <integer>1</integer>
+</dict>
+</plist>
diff --git a/templates/index.html b/templates/index.html
index afadf8b..535c4f7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -33,9 +33,6 @@
     <li>
       <a href="{{$.BasePath}}/pubkeys/"><span class="item-marker">›</span> Update your public SSH keys</a>
     </li>
-    <li>
-      <a href="{{$.BasePath}}/ideviceconf" rel="external"><span class="item-marker">›</span> Configure eduroam on your iDevice</a>
-    </li>
   {{ end }}
   </ul>
   <p>
-- 
cgit v1.1