aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'id/server/data/deploy')
-rw-r--r--id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html6
-rw-r--r--id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html2
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js2
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html6
-rw-r--r--id/server/data/deploy/conf/moa-id/moa-id.properties29
5 files changed, 22 insertions, 23 deletions
diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
index 02b86472b..32f0a7d4d 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
@@ -22,7 +22,7 @@
<h2 id="tabheader" class="dunkel" role="heading">$HEADER_TEXT</h2>
</div>
<div id="bkulogin" class="hell" role="form">
- <div id="mandateLogin" style="">
+ <div id="mandateLogin" style="$MANDATEVISIBLE">
<div>
<input tabindex="1" type="checkbox" name="Mandate"
id="mandateCheckBox" class="verticalcenter" role="checkbox"
@@ -37,13 +37,13 @@
</div>
<div id="bkuselectionarea">
<div id="bkukarte">
- <img id="bkuimage" class="bkuimage" src="$contextPath/img/online-bku.png"
+ <img id="bkuimage" class="bkuimage" src="$contextPath/img/karte.png"
alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
onClick="bkuOnlineClicked();" tabindex="2" role="button"
value="Karte" />
</div>
<div id="bkuhandy">
- <img class="bkuimage" src="$contextPath/img/mobile-bku.png"
+ <img class="bkuimage" src="$contextPath/img/handysign.png"
alt="HandyBKU" /> <input name="bkuButtonHandy" type="button"
onClick="bkuHandyClicked();" tabindex="3" role="button"
value="HANDY" />
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/htmlTemplates/javascript_tempalte.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
index eadb65b2b..a463bae65 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
@@ -142,7 +142,7 @@ function isIE() {
var image = document.getElementById("bkuimage");
var srcatt = image.getAttribute("src");
var last = srcatt.substring(srcatt.lastIndexOf('/')+1);
- srcatt = srcatt.replace(last,'online-bku-deactivated.png');
+ srcatt = srcatt.replace(last,'karte_deactivated.png');
image.setAttribute("src",srcatt);
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
index 02b86472b..32f0a7d4d 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -22,7 +22,7 @@
<h2 id="tabheader" class="dunkel" role="heading">$HEADER_TEXT</h2>
</div>
<div id="bkulogin" class="hell" role="form">
- <div id="mandateLogin" style="">
+ <div id="mandateLogin" style="$MANDATEVISIBLE">
<div>
<input tabindex="1" type="checkbox" name="Mandate"
id="mandateCheckBox" class="verticalcenter" role="checkbox"
@@ -37,13 +37,13 @@
</div>
<div id="bkuselectionarea">
<div id="bkukarte">
- <img id="bkuimage" class="bkuimage" src="$contextPath/img/online-bku.png"
+ <img id="bkuimage" class="bkuimage" src="$contextPath/img/karte.png"
alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
onClick="bkuOnlineClicked();" tabindex="2" role="button"
value="Karte" />
</div>
<div id="bkuhandy">
- <img class="bkuimage" src="$contextPath/img/mobile-bku.png"
+ <img class="bkuimage" src="$contextPath/img/handysign.png"
alt="HandyBKU" /> <input name="bkuButtonHandy" type="button"
onClick="bkuHandyClicked();" tabindex="3" role="button"
value="HANDY" />
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..784f66602 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -5,24 +5,24 @@
******
-##General MOA-ID 3.0 Configuration
+##General MOA-ID 3.x Configuration
##For Testing
configuration.validation.certificate.QC.ignore=false
protocols.pvp2.assertion.encryption.active=false
protocols.pvp2.schemavalidation=true
-##General MOA-ID 2.0 operations
-#MOA-ID 2.0 session information encryption key (PassPhrase)
+##General MOA-ID 3.x operations
+#MOA-ID 3.x session information encryption key (PassPhrase)
configuration.moasession.key=SessionEncryptionKey
configuration.moaconfig.key=ConfigurationEncryptionKey
-#MOA-ID 2.0 Monitoring Servlet
+#MOA-ID 3.x Monitoring Servlet
configuration.monitoring.active=false
configuration.monitoring.message.success=All Tests passed!
configuration.monitoring.test.identitylink.url=$PATH_TO_CONFIG$/conf/moa-id/monitoring/monitoring_idl.xml
-#MOA-ID 2.0 Advanced Logging
+#MOA-ID 3.x Advanced Logging
configuration.advancedlogging.active=false
##Webservice Client Configuration
@@ -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
@@ -72,7 +65,7 @@ protocols.oauth20.jwt.ks.key.name=oauth
protocols.oauth20.jwt.ks.key.password=password
##Database configuration##
-#Hibnerate configuration for MOA-ID 2.0 session store
+#Hibnerate configuration for MOA-ID 3.x session store
moasession.hibernate.dialect=org.hibernate.dialect.MySQLDialect
moasession.hibernate.connection.url=jdbc:mysql://localhost/moa-id-session?charSet=utf-8
moasession.hibernate.connection.charSet=utf-8
@@ -93,7 +86,7 @@ moasession.hibernate.c3p0.max_size=20
moasession.hibernate.c3p0.max_statements=0
moasession.hibernate.c3p0.min_size=3
-#Hibnerate configuration for MOA-ID 2.0 configuration
+#Hibnerate configuration for MOA-ID 3.x configuration
configuration.hibernate.dialect=org.hibernate.dialect.MySQLDialect
configuration.jpaVendorAdapter.generateDdl=true
configuration.hibernate.show_sql=false
@@ -116,7 +109,7 @@ configuration.dbcp.testWhileIdle=false
configuration.dbcp.validationQuery=SELECT 1
#
-#Hibnerate configuration for MOA-ID 2.0 advanced statistic logging
+#Hibnerate configuration for MOA-ID 3.x advanced statistic logging
advancedlogging.hibernate.dialect=org.hibernate.dialect.MySQLDialect
advancedlogging.hibernate.connection.url=jdbc:mysql://localhost/moa-id-statistic?charSet=utf-8&autoReconnect=true
advancedlogging.hibernate.connection.charSet=utf-8
@@ -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=