WIP redirect seems to work

zanata · Sep 1, 2017 · 336cac0 · 336cac0
1 parent 4546f68
commit 336cac0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/server/docker/conf/sample-picketlink.xml b/server/docker/conf/sample-picketlink.xml
@@ -4,17 +4,17 @@
   /system-property="picketlink.file":add(value="/opt/jboss/wildfly/picketlink.xml")
   reload
 -->
-  <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:2.1" BindingType="POST" SupportsSignatures="true">
+  <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:2.1" BindingType="POST" SupportsSignatures="false">
     <IdentityURL>${idp.url::http://localhost:8080/identity/}</IdentityURL>
     <ServiceURL>${service.url::http://pahuang.usersys.redhat.com:8080/ssologin}</ServiceURL>
-    <KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">
-      <Auth Key="KeyStoreURL" Value="/my_keystore.jks" />
-      <Auth Key="KeyStorePass" Value="store123" />
-      <Auth Key="SigningKeyPass" Value="test123" />
-      <Auth Key="SigningKeyAlias" Value="servercert" />
-      <ValidatingAlias Key="idp.example.com" Value="servercert" />
-      <ValidatingAlias Key="localhost" Value="servercert" />
-    </KeyProvider>
+    <!--<KeyProvider ClassName="org.picketlink.identity.federation.core.impl.KeyStoreKeyManager">-->
+      <!--<Auth Key="KeyStoreURL" Value="/my_keystore.jks" />-->
+      <!--<Auth Key="KeyStorePass" Value="store123" />-->
+      <!--<Auth Key="SigningKeyPass" Value="test123" />-->
+      <!--<Auth Key="SigningKeyAlias" Value="servercert" />-->
+      <!--<ValidatingAlias Key="idp.example.com" Value="servercert" />-->
+      <!--<ValidatingAlias Key="localhost" Value="servercert" />-->
+    <!--</KeyProvider>-->
   </PicketLinkSP>
 
   <Handlers xmlns="urn:picketlink:identity-federation:handler:config:2.1">

diff --git a/server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml b/server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
@@ -68,6 +68,11 @@
     <param-value>false</param-value>
   </context-param>
 
+  <context-param>
+    <param-name>CONFIG_FILE</param-name>
+    <param-value>/opt/jboss/wildfly/picketlink.xml</param-value>
+  </context-param>
+
   <!-- Suppress spurious stylesheets -->
 
   <context-param>