From 7df79349f42eaa22d0fb35fa8bd82270fd80621e Mon Sep 17 00:00:00 2001
From: Andrea Ceccanti <andrea.ceccanti@gmail.com>
Date: Mon, 11 Jul 2016 17:32:54 +0200
Subject: [PATCH] Cosmetic reordering

---
 .../src/main/resources/application.yml        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/iam-login-service/src/main/resources/application.yml b/iam-login-service/src/main/resources/application.yml
index 783b8d5b2..1a1b3c54c 100644
--- a/iam-login-service/src/main/resources/application.yml
+++ b/iam-login-service/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 security:
   filter-order: 1
-   
+
 server:
   port: ${IAM_PORT:8080}
   tomcat:
@@ -23,22 +23,22 @@ spring:
 iam:
   baseUrl: ${IAM_BASE_URL:http://localhost:8080}
   issuer: ${IAM_ISSUER:http://localhost:8080}
-  
+
   token:
     lifetime: 86400
-  
+
   organisation:
     name: indigo-dc
-  
+
   keyStoreLocation: ${IAM_KEY_STORE_LOCATION:classpath:keystore.jwks}
 
 x509:
   trustAnchorsDir: ${IAM_X509_TRUST_ANCHORS_DIR:/etc/grid-security/certificates}
-  trustAnchorsRefreshMsec: ${IAM_X509_TRUST_ANCHORS_REFRESH:14400} 
-  
+  trustAnchorsRefreshMsec: ${IAM_X509_TRUST_ANCHORS_REFRESH:14400}
+
 google:
     issuer: https://accounts.google.com
-    
+
     client:
       clientId: ${IAM_GOOGLE_CLIENT_ID:define_me_please}
       clientSecret: ${IAM_GOOGLE_CLIENT_SECRET:define_me_please}
@@ -56,7 +56,7 @@ github:
     useCurrentUri: false
     scope: user:email
   resource:
-    userInfoUri: https://api.github.com/user 
+    userInfoUri: https://api.github.com/user
 ---
 spring:
   profiles: h2
@@ -86,7 +86,7 @@ spring:
     validation-query: ${IAM_DB_VALIDATION_QUERY:SELECT 1}
     time-between-eviction-runs-millis: ${IAM_DB_TIME_BETWEEN_EVICTION_RUNS_MILLIS:5000}
     min-evictable-idle-time-millis: ${IAM_DB_MIN_EVICTABLE_IDLE_TIME_MILLIS:60000}
-  
+
   jpa:
     openInView: false
 
@@ -110,7 +110,7 @@ spring:
     validation-query: ${IAM_DB_VALIDATION_QUERY:SELECT 1}
     time-between-eviction-runs-millis: ${IAM_DB_TIME_BETWEEN_EVICTION_RUNS_MILLIS:5000}
     min-evictable-idle-time-millis: ${IAM_DB_MIN_EVICTABLE_IDLE_TIME_MILLIS:60000}
-  
+
   jpa:
     openInView: false
 
@@ -134,7 +134,7 @@ spring:
     validation-query: ${IAM_DB_VALIDATION_QUERY:SELECT 1}
     time-between-eviction-runs-millis: ${IAM_DB_TIME_BETWEEN_EVICTION_RUNS_MILLIS:5000}
     min-evictable-idle-time-millis: ${IAM_DB_MIN_EVICTABLE_IDLE_TIME_MILLIS:60000}
-  
+
   jpa:
     openInView: false
 
@@ -145,11 +145,11 @@ flyway:
 ---
 spring:
   profiles: saml
-  
+
 saml:
   entity-id: ${IAM_SAML_ENTITY_ID:urn:iam:iam-devel}
   keystore: ${IAM_SAML_KEYSTORE:classpath:/saml/samlKeystore.jks}
-  idp-metadata: ${IAM_SAML_IDP_METADATA:classpath:/saml/idp-metadata.xml}
   keystore-password: ${IAM_SAML_KEYSTORE_PASSWORD:password}
   key-id: ${IAM_SAML_KEY_ID:iam}
-  key-password: ${IAM_SAML_KEY_PASSWORD:password}
\ No newline at end of file
+  key-password: ${IAM_SAML_KEY_PASSWORD:password}
+  idp-metadata: ${IAM_SAML_IDP_METADATA:classpath:/saml/idp-metadata.xml}