From 04636e11d108f26df4712c62be108d68ba166e0a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 4 Feb 2014 12:14:06 +0100
Subject: * update demoOA layout * add test keystore

---
 .../deploy/conf/moa-id-configuration/keys/moa_idp.p12    | Bin 0 -> 7885 bytes
 id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12    | Bin 0 -> 7885 bytes
 id/server/data/deploy/conf/moa-id/keys/moa_idp.p12       | Bin 0 -> 7885 bytes
 id/server/data/deploy/conf/moa-id/moa-id.properties      |   8 --------
 4 files changed, 8 deletions(-)
 create mode 100644 id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12
 create mode 100644 id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12
 create mode 100644 id/server/data/deploy/conf/moa-id/keys/moa_idp.p12

(limited to 'id/server/data/deploy')

diff --git a/id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12 b/id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12
new file mode 100644
index 000000000..78cab1e89
Binary files /dev/null and b/id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12 differ
diff --git a/id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12 b/id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12
new file mode 100644
index 000000000..78cab1e89
Binary files /dev/null and b/id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12 differ
diff --git a/id/server/data/deploy/conf/moa-id/keys/moa_idp.p12 b/id/server/data/deploy/conf/moa-id/keys/moa_idp.p12
new file mode 100644
index 000000000..78cab1e89
Binary files /dev/null and b/id/server/data/deploy/conf/moa-id/keys/moa_idp.p12 differ
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index 879cb575a..73627ef9b 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -32,14 +32,6 @@ service.foreignidentities.clientKeyStore=keys/....
 service.foreignidentities.clientKeyStorePassword=
 
 
-##STORK configuration
-#STORK
-stork.samlsigningparameter.signaturecreation.keystore.file=keys/storkDemoKeys.jks
-stork.samlsigningparameter.signaturecreation.keystore.password=local-demo
-stork.samlsigningparameter.signaturecreation.keyname.name=at-demo-cert
-stork.samlsigningparameter.signaturecreation.keyname.password=stork
-
-
 ##Protocol configuration##
 #PVP2
 protocols.pvp2.idp.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp.p12
-- 
cgit v1.2.3


From 76287102b660413b778fc87fc0103b3a023747ee Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 4 Feb 2014 13:11:50 +0100
Subject: * update OAConfig validator * move old documentation to a new
 directory * add PreRelease docu * add moa-id-proxy sample-config

---
 .../conf/moa-id-proxy/MOAIDConfiguration.xml       | 67 ++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml

(limited to 'id/server/data/deploy')

diff --git a/id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml b/id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml
new file mode 100644
index 000000000..51b36a1da
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Beispielkonfiguration fuer MOA-ID -->
+<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">	
+	<!-- Konfiguration fuer MOA-ID-PROXY -->
+	<ProxyComponent>
+		<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-ID-AUTH Web Service -->
+		<AuthComponent>
+			<ConnectionParameter URL="http://labda.iaik.tugraz.at:8080/moa-id-auth/services/GetAuthenticationData">
+				<AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates>
+				<!--	<ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+			</ConnectionParameter>
+		</AuthComponent>
+	</ProxyComponent>
+	
+  <!-- Eintragung fuer jede Online-Applikation -->
+	<!-- Demo Online-Applikation: Zugriff auf www.digitales.oesterreich.gv.at ueber MOA-ID-PROXY -->
+	<OnlineApplication type="businessService" publicURLPrefix="https://proxy.gv.at" friendlyName="Test Application">
+		<!-- fuer MOA-ID-PROXY -->
+		<ProxyComponent configFileURL="oa/BasicOAConfiguration.xml" sessionTimeOut="600" 
+        loginParameterResolverImpl="at.gv.egiz.moa.id.proxy.MySQLLoginParameterResolver" 
+        loginParameterResolverConfiguration="/var/lib/tomcat6/webapps/moa-id-proxy-umgmt/WEB-INF/classes/hibernate.cfg.xml"
+			  connectionBuilderImpl="at.gv.egovernment.moa.id.proxy.EnhancedConnectionBuilder"
+        errorRedirectURL="https://proxy.gv.at/oa2">
+
+			<!-- URL und akzeptierte TLS-Server-Zertifikate der Online-Applikation -->
+			<ConnectionParameter URL="https://proxy.gv.at/oa">
+				 <AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates>
+				<!--	<ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+			</ConnectionParameter>
+		</ProxyComponent>
+	</OnlineApplication>
+  
+	<!-- Eintragung fuer jede Online-Applikation -->
+	<!-- Demo Online-Applikation: Zugriff auf www.digitales.oesterreich.gv.at ueber MOA-ID-PROXY -->
+	<OnlineApplication type="businessService" publicURLPrefix="https://proxy.gv.at" friendlyName="Test Application">
+		<!-- fuer MOA-ID-PROXY -->
+		<ProxyComponent configFileURL="oa/BasicOAConfiguration.xml" sessionTimeOut="600" 
+        errorRedirectURL="https://proxy.gv.at/oa2">
+
+			<!-- URL und akzeptierte TLS-Server-Zertifikate der Online-Applikation -->
+			<ConnectionParameter URL="https://proxy.gv.at/oa">
+				 <AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates>
+				<!--	<ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+			</ConnectionParameter>
+		</ProxyComponent>
+	</OnlineApplication>
+		
+	<!-- ChainingModes fuer die Zertifikatspfadueberpruefug der TLS-Zertifikate -->
+	<ChainingModes systemDefaultMode="pkix">
+  </ChainingModes>
+	<!-- fuer MOA-ID-AUTH:  CA-Zertifikat des Servers MOA-SP, falls dieses Service ueber HTTPS angesprochen wird 
+       fuer MOA-ID-PROXY: CA-Zertifikat des Servers MOA-ID-AUTH, falls dieses Service ueber HTTPS angesprochen wird 
+       zusaeztlich: CA-Zertifikat aller Online-Applikationen, die ueber HTTPS angesprochen werden -->
+	<TrustedCACertificates>certs/ca-certs</TrustedCACertificates>
+	<!-- Cache-Verzeichnis fuer-Zertifikate -->
+	<!-- Hinweis: wenn TC in linux oder unix betrieben wird vollstaendigen pfad fuer DirectoryCertStoreParameters.RootDir verwenden -->
+	<GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="/etc/tomcat6/moa-id/certs/certstore"/>
+	<!-- Time-Out fuer die Anmeldung von Beginn bis zum Anlegen der Anmeldedaten, in Sekunden -->
+	<GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
+	<!-- Time-Out fuer die Anmeldung vom Anlegen bis zum Abholen der Anmeldedaten, in Sekunden -->
+	<GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
+	<!-- Alternatives Data URL prefix (falls Webserver vorgeschaltet wird) -->
+	<!--GenericConfiguration name="FrontendServlets.DataURLPrefix" value="https://<your_webserver>/moa-id-auth/"/ -->
+	<!-- HTTP Verbindung auf Frontend Servlets zulassen / verbieten (falls Webserver vorgeschaltet wird) -->
+	<!-- GenericConfiguration name="FrontendServlets.EnableHTTPConnection" value="true"/ -->
+	<!-- URL Liste der vertrauenwürdigen Bürgekartenumgebungen -->
+</MOA-IDConfiguration>
-- 
cgit v1.2.3