aboutsummaryrefslogtreecommitdiff
path: root/ms_specific_connector/src/main/resources
diff options
context:
space:
mode:
authorThomas <>2022-07-05 17:49:34 +0200
committerThomas <>2022-07-05 17:49:34 +0200
commitb5766d8107d6e557921f9a694893a1284963ef16 (patch)
tree708e695bb0c90d958ef0e3cde6008169fb683893 /ms_specific_connector/src/main/resources
parent154f7f2a9c8a33d3fedf341df2be62d8404ff77f (diff)
parent48695aa01a86890990dc4e42b9d44493ec840b25 (diff)
downloadNational_eIDAS_Gateway-b5766d8107d6e557921f9a694893a1284963ef16.tar.gz
National_eIDAS_Gateway-b5766d8107d6e557921f9a694893a1284963ef16.tar.bz2
National_eIDAS_Gateway-b5766d8107d6e557921f9a694893a1284963ef16.zip
Merge branch 'nightlybuild' into feature/ms_proxy_service
Diffstat (limited to 'ms_specific_connector/src/main/resources')
-rw-r--r--ms_specific_connector/src/main/resources/application.properties3
-rw-r--r--ms_specific_connector/src/main/resources/properties/messages.properties3
-rw-r--r--ms_specific_connector/src/main/resources/properties/messages_de.properties3
3 files changed, 3 insertions, 6 deletions
diff --git a/ms_specific_connector/src/main/resources/application.properties b/ms_specific_connector/src/main/resources/application.properties
index 700f4d74..660e8099 100644
--- a/ms_specific_connector/src/main/resources/application.properties
+++ b/ms_specific_connector/src/main/resources/application.properties
@@ -130,6 +130,9 @@ eidas.ms.auth.eIDAS.szrclient.eidasbind.mds.inject=false
#### matching######
+eidas.ms.auth.eIDAS.matching.byaddress.enable=true
+eidas.ms.auth.eIDAS.matching.byaddress.maxresults=250
+
# ZMR communication
#eidas.ms.auth.eIDAS.zmrclient.endpoint=http://localhost:1234/demozmr
#eidas.ms.auth.eIDAS.zmrclient.ssl.keyStore.type=jks
diff --git a/ms_specific_connector/src/main/resources/properties/messages.properties b/ms_specific_connector/src/main/resources/properties/messages.properties
index a2aaf95d..cc60cd6e 100644
--- a/ms_specific_connector/src/main/resources/properties/messages.properties
+++ b/ms_specific_connector/src/main/resources/properties/messages.properties
@@ -47,11 +47,8 @@ gui.countryselection.country.is=Iceland
gui.countryselection.country.is.logo.alt=Iceland-eID
gui.countryselection.country.it=Italy
gui.countryselection.country.it.logo.alt=Italy-eID
-<<<<<<< HEAD
gui.countryselection.country.li=Lichtenstein
gui.countryselection.country.li.logo.alt=Lichtensteinische-eID
-=======
->>>>>>> 1ad67c91820de1c7f2b2541f8e39752baac197d2
gui.countryselection.country.lt=Lithuania
gui.countryselection.country.lt.logo.alt=Lithuania-eID
gui.countryselection.country.lv=Latvia
diff --git a/ms_specific_connector/src/main/resources/properties/messages_de.properties b/ms_specific_connector/src/main/resources/properties/messages_de.properties
index 187b7b37..6f470ea0 100644
--- a/ms_specific_connector/src/main/resources/properties/messages_de.properties
+++ b/ms_specific_connector/src/main/resources/properties/messages_de.properties
@@ -48,11 +48,8 @@ gui.countryselection.country.is=Island
gui.countryselection.country.is.logo.alt=Isländische-eID
gui.countryselection.country.it=Italien
gui.countryselection.country.it.logo.alt=Italienische-eID
-<<<<<<< HEAD
gui.countryselection.country.li=Lichtenstein
gui.countryselection.country.li.logo.alt=Lichtensteinische-eID
-=======
->>>>>>> 1ad67c91820de1c7f2b2541f8e39752baac197d2
gui.countryselection.country.lt=Litauen
gui.countryselection.country.lt.logo.alt=Litauische-eID
gui.countryselection.country.lv=Lettland