From 3e3b665587f821bd01a93635495be25d588bd84d Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 21 May 2014 12:30:12 +0200 Subject: update default config --- .../conf/moa-id/SLTemplates/template_handyBKU.html | 38 +++++++++++++++++++++ .../conf/moa-id/SLTemplates/template_localBKU.html | 30 ++++++++++++++++ .../moa-id/SLTemplates/template_onlineBKU.html | 37 ++++++++++++++++++++ .../doc/conf/moa-id/keys/moa_idp[password].p12 | Bin 7885 -> 5346 bytes id/server/doc/conf/moa-id/log4j.properties | 4 +-- id/server/doc/conf/moa-id/moa-id.properties | 13 +++++-- id/server/doc/conf/moa-id/stork/SamlEngine.xml | 2 +- .../doc/conf/moa-id/stork/StorkSamlEngine_VIDP.xml | 1 + 8 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 id/server/doc/conf/moa-id/SLTemplates/template_handyBKU.html create mode 100644 id/server/doc/conf/moa-id/SLTemplates/template_localBKU.html create mode 100644 id/server/doc/conf/moa-id/SLTemplates/template_onlineBKU.html (limited to 'id/server/doc/conf/moa-id') diff --git a/id/server/doc/conf/moa-id/SLTemplates/template_handyBKU.html b/id/server/doc/conf/moa-id/SLTemplates/template_handyBKU.html new file mode 100644 index 000000000..5a335f9a1 --- /dev/null +++ b/id/server/doc/conf/moa-id/SLTemplates/template_handyBKU.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/id/server/doc/conf/moa-id/SLTemplates/template_localBKU.html b/id/server/doc/conf/moa-id/SLTemplates/template_localBKU.html new file mode 100644 index 000000000..329fe6f8d --- /dev/null +++ b/id/server/doc/conf/moa-id/SLTemplates/template_localBKU.html @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + diff --git a/id/server/doc/conf/moa-id/SLTemplates/template_onlineBKU.html b/id/server/doc/conf/moa-id/SLTemplates/template_onlineBKU.html new file mode 100644 index 000000000..52abf83fb --- /dev/null +++ b/id/server/doc/conf/moa-id/SLTemplates/template_onlineBKU.html @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + diff --git a/id/server/doc/conf/moa-id/keys/moa_idp[password].p12 b/id/server/doc/conf/moa-id/keys/moa_idp[password].p12 index 78cab1e89..25f585be5 100644 Binary files a/id/server/doc/conf/moa-id/keys/moa_idp[password].p12 and b/id/server/doc/conf/moa-id/keys/moa_idp[password].p12 differ diff --git a/id/server/doc/conf/moa-id/log4j.properties b/id/server/doc/conf/moa-id/log4j.properties index 310b58a3d..c7dece5c5 100644 --- a/id/server/doc/conf/moa-id/log4j.properties +++ b/id/server/doc/conf/moa-id/log4j.properties @@ -2,11 +2,11 @@ org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory # define log4j root loggers -log4j.rootLogger=info, stdout, R +log4j.rootLogger=info, stdout log4j.logger.at.gv.egovernment.moa=info log4j.logger.at.gv.egovernment.moa.spss=info log4j.logger.iaik.server=info -log4j.logger.at.gv.egovernment.moa.id=info +log4j.logger.at.gv.egovernment.moa.id=info,R log4j.logger.at.gv.egovernment.moa.id.proxy=info log4j.logger.eu.stork=info log4j.logger.org.hibernate=warn diff --git a/id/server/doc/conf/moa-id/moa-id.properties b/id/server/doc/conf/moa-id/moa-id.properties index bf9cf84d0..e8a75c348 100644 --- a/id/server/doc/conf/moa-id/moa-id.properties +++ b/id/server/doc/conf/moa-id/moa-id.properties @@ -1,3 +1,10 @@ +******** +* +*$PATH_TO_CONFIG$ muss durch den eigentlichen Pfad ersetzt werden! +* +****** + + ##General MOA-ID 2.0 Configuration #MOA-ID 2.0 XML configuration files (necessary, if inmemory database is used) @@ -38,15 +45,17 @@ service.foreignidentities.clientKeyStorePassword= ##Protocol configuration## #PVP2 -protocols.pvp2.idp.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp.p12 +protocols.pvp2.idp.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp[password].p12 protocols.pvp2.idp.ks.kspassword=password protocols.pvp2.idp.ks.metadata.alias=pvp_metadata protocols.pvp2.idp.ks.metadata.keypassword=password protocols.pvp2.idp.ks.assertion.sign.alias=pvp_assertion protocols.pvp2.idp.ks.assertion.sign.keypassword=password +protocols.pvp2.idp.ks.assertion.encryption.alias=pvp_assertion +protocols.pvp2.idp.ks.assertion.encryption.keypassword=password #OpenID connect (OAuth) -protocols.oauth20.jwt.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp.p12 +protocols.oauth20.jwt.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp[password].p12 protocols.oauth20.jwt.ks.password=password protocols.oauth20.jwt.ks.key.name=oauth protocols.oauth20.jwt.ks.key.password=password diff --git a/id/server/doc/conf/moa-id/stork/SamlEngine.xml b/id/server/doc/conf/moa-id/stork/SamlEngine.xml index 166a48ff8..eca38ec8c 100644 --- a/id/server/doc/conf/moa-id/stork/SamlEngine.xml +++ b/id/server/doc/conf/moa-id/stork/SamlEngine.xml @@ -61,7 +61,7 @@ - + diff --git a/id/server/doc/conf/moa-id/stork/StorkSamlEngine_VIDP.xml b/id/server/doc/conf/moa-id/stork/StorkSamlEngine_VIDP.xml index 83e69ac23..5aff0d1fa 100644 --- a/id/server/doc/conf/moa-id/stork/StorkSamlEngine_VIDP.xml +++ b/id/server/doc/conf/moa-id/stork/StorkSamlEngine_VIDP.xml @@ -90,5 +90,6 @@ http://www.stork.gov.eu/1.0/mandateContent http://www.stork.gov.eu/1.0/representative http://www.stork.gov.eu/1.0/represented + http://www.stork.gov.eu/1.0/mandateType -- cgit v1.2.3