From d0549d38abe7b531db3b900fc628da4aa591c45a Mon Sep 17 00:00:00 2001
From: Henrik Lund Kramshoej <hlk@kramse.org>
Date: Thu, 13 Jul 2017 12:21:27 +0200
Subject: Sync

---
 Dockerfile                             | 2 ++
 README.md                              | 3 +++
 install.properties                     | 4 ++--
 template-config/attribute-resolver.xml | 7 ++++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 10d384f..824481c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,12 +9,14 @@ COPY shibboleth-identity-provider-${IDP_VERSION}.tar.gz.sha256 /opt/
 COPY shibboleth-identity-provider-${IDP_VERSION}.tar.gz /opt/
 COPY template-config/ /opt/template-config
 COPY shibboleth.db.ddl /tmp/
+COPY apache-sp/nordunet.png /tmp/
 WORKDIR /opt
 RUN apk --no-cache add bash apache-ant sqlite curl && \
     #curl -O https://shibboleth.net/downloads/identity-provider/${IDP_VERSION}/shibboleth-identity-provider-${IDP_VERSION}.tar.gz && \
     sha256sum -c shibboleth-identity-provider-$IDP_VERSION.tar.gz.sha256 && \
     tar xf shibboleth-identity-provider-$IDP_VERSION.tar.gz && \
     mv shibboleth-identity-provider-$IDP_VERSION shibboleth-identity-provider && \
+    cp /tmp/nordunet.png ./shibboleth-identity-provider/webapp/images/dummylogo.png && \
     ./shibboleth-identity-provider/bin/install.sh -propertyfile install.properties && \
     apk --no-cache del apache-ant && \
     cp /opt/template-config/*.xml /opt/shibboleth-idp/conf && \
diff --git a/README.md b/README.md
index a712d04..fab1c2b 100755
--- a/README.md
+++ b/README.md
@@ -160,6 +160,9 @@ StaticPKIXX509Credential
 
 # Other Links
 
+https://spaces.internet2.edu/pages/viewpage.action?pageId=49841792#LinuxIdentityProviderIdPv3(Centos7
+"1. Customize the IdP's Login Page"
+
 http://www.jeesty.com/shibboleth
 Description of how Shibd works with Apache
 
diff --git a/install.properties b/install.properties
index a052dcb..13ca6ad 100644
--- a/install.properties
+++ b/install.properties
@@ -12,8 +12,8 @@ ldap.merge.properties=/opt/nordu-ldap.properties
 # Skinning it
 idp.title = IDP Dev Web Login Service
 idp.title.suffix = Error
-idp.logo = /images/dummylogo.png
-idp.logo.alt-text = Replace or remove this logo
+idp.logo = /images/nordunet.png
+idp.logo.alt-text = Nordic Gateway for Research & Education
 idp.message = An unidentified error occurred.
 idp.footer = IDP dev footer text.
 
diff --git a/template-config/attribute-resolver.xml b/template-config/attribute-resolver.xml
index a3f7de2..60cf223 100644
--- a/template-config/attribute-resolver.xml
+++ b/template-config/attribute-resolver.xml
@@ -79,6 +79,9 @@
                 %{idp.attribute.resolver.LDAP.searchFilter}
             ]]>
         </FilterTemplate>
+        <!-- Do we even need a connection pool? Got this:
+        WARN [org.ldaptive.pool.BlockingConnectionPool:882] - org.ldaptive.pool.AbstractConnectionPool$DefaultPooledConnectionProxy@6ec7349e failed validation
+
         <ConnectionPool
                   minPoolSize="%{idp.pool.LDAP.minSize:3}"
                   maxPoolSize="%{idp.pool.LDAP.maxSize:10}"
@@ -86,7 +89,9 @@
                   validatePeriodically="%{idp.pool.LDAP.validatePeriodically:true}"
                   validateTimerPeriod="%{idp.pool.LDAP.validatePeriod:PT5M}"
                   expirationTime="%{idp.pool.LDAP.idleTime:PT10M}"
-                  failFastInitialize="%{idp.pool.LDAP.failFastInitialize:false}" />
+                  failFastInitialize="%{idp.pool.LDAP.failFastInitialize:false}" />-->
+
+
     </DataConnector>
 <!--    <DataConnector id="myLDAP" xsi:type="LDAPDirectory"
         ldapURL="%{idp.attribute.resolver.LDAP.ldapURL}"
-- 
cgit v1.1