aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy/conf
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-04-07 10:45:13 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-04-07 10:45:13 +0200
commite5e4f2b8cc2652e47d31ace6ee35e7aeab7d814a (patch)
tree2ca6f503e2fe42645c188562ad08953637994e8e /id/server/data/deploy/conf
parent4b932484d66ef161bb547a419fdc32f04677fe57 (diff)
downloadmoa-id-spss-e5e4f2b8cc2652e47d31ace6ee35e7aeab7d814a.tar.gz
moa-id-spss-e5e4f2b8cc2652e47d31ace6ee35e7aeab7d814a.tar.bz2
moa-id-spss-e5e4f2b8cc2652e47d31ace6ee35e7aeab7d814a.zip
small default-config and handbook updates for final version 3.1.0
Diffstat (limited to 'id/server/data/deploy/conf')
-rw-r--r--id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html2
-rw-r--r--id/server/data/deploy/conf/moa-id/moa-id.properties13
2 files changed, 7 insertions, 8 deletions
diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html
index a9f0c4238..7ae4b3f92 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html
+++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html
@@ -3,7 +3,7 @@
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<!-- MOA-ID 2.x BKUSelection Layout CSS -->
- <link rel="stylesheet" href="$contextPath/css/buildCSS?pendingid=#ID#" />
+ <link rel="stylesheet" href="$contextPath/css/buildCSS?pendingid=$pendingReqID" />
<title>Anmeldung an Online-Applikation</title>
</head>
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 964fe0646..a3a677a0d 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -47,13 +47,6 @@ stork.fakeIdL.countries=
stork.fakeIdL.keygroup=
stork.documentservice.url=
-
-## eIDAS protocol configuration
-moa.id.protocols.eIDAS.samlengine.config.file=eIDAS/SamlEngine_basics.xml
-moa.id.protocols.eIDAS.samlengine.sign.config.file=eIDAS/SignModule.xml
-moa.id.protocols.eIDAS.samlengine.enc.config.file=eIDAS/EncryptModule.xml
-moa.id.protocols.eIDAS.metadata.validation.truststore=eIDAS_metadata
-
##Protocol configuration##
#PVP2
protocols.pvp2.idp.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp[password].p12
@@ -142,6 +135,12 @@ advancedlogging.hibernate.c3p0.min_size=3
## This additional eID moduls add special functionality to MOA-ID-Auth.
## The configuration of this modules is only needed if this modules are in use.
########
+### eIDAS protocol configuration ###
+moa.id.protocols.eIDAS.samlengine.config.file=eIDAS/SamlEngine_basics.xml
+moa.id.protocols.eIDAS.samlengine.sign.config.file=eIDAS/SignModule.xml
+moa.id.protocols.eIDAS.samlengine.enc.config.file=eIDAS/EncryptModule.xml
+moa.id.protocols.eIDAS.metadata.validation.truststore=eIDAS_metadata
+
### HBV Mandate-Service client module ###
modules.elga_mandate.nameID.target=urn:publicid:gv.at:cdid+GH
modules.elga_mandate.service.entityID=