Merge branch 'KON-599_disable_ldap' into DEVELOP
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a3c35ba..a486a40 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -40,7 +40,7 @@
mail-id: 1
telephone-number-id: 2
scheduling:
- enabled: true
+ enabled: false
cron-expression: '*/10 * * * * *'
authnauth-sync:
diff --git a/src/main/resources/application_localdev.yml b/src/main/resources/application_localdev.yml
index 8b55d1a..df6c57e 100644
--- a/src/main/resources/application_localdev.yml
+++ b/src/main/resources/application_localdev.yml
@@ -25,31 +25,7 @@
urls: ldap://entopkon:10389
ldap:
- attribute-mapping:
- uid: uid
- fullname: cn
- lastname: sn
- firstname: givenname
- title: title
- mail: mail
- department: department
- telephone-number: phone
- db-id-mapping:
- mail-id: 1
- telephone-number-id: 2
- scheduling:
- enabled: false
- cron-expression: '*/10 * * * * *'
-
-server:
- port: 9155
- max-http-header-size: 262144
- servlet:
- session:
- tracking-modes: cookie
-
-ldap:
- enabled: false
+ enabled: true
ldap-sync:
attribute-mapping:
uid: uid
@@ -67,6 +43,23 @@
enabled: false
cron-expression: '*/10 * * * * *'
+authnauth-sync:
+ attribute-mapping:
+ lastname: true
+ firstname: true
+ scheduling:
+ enabled: false
+ cron-expression: '*/10 * * * * *'
+ technical-userpassword: admin
+ technical-username: admin
+
+server:
+ port: 9155
+ max-http-header-size: 262144
+ servlet:
+ session:
+ tracking-modes: cookie
+
jwt:
tokenHeader: Authorization
useStaticJwt: true
@@ -81,7 +74,6 @@
listOfServers: http://entopkon:8880
cors:
- allowedOrigins: http://localhost:8080
corsEnabled: false
logging:
