From b38089213a3134cd6979d13b0e90959755d15f58 Mon Sep 17 00:00:00 2001
From: Saumya Saumya <M1049065@mindtree.com>
Date: Wed, 12 Feb 2020 12:13:52 +0530
Subject: [PATCH] Adding config

---
 config-templates/admin-env.properties         |  7 +++++++
 config-templates/kernel-env.properties        |  8 ++++++++
 .../pre-registration-env.properties           | 20 ++-----------------
 config-templates/registration-env.properties  |  2 +-
 config-templates/resident-env.properties      |  2 +-
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/config-templates/admin-env.properties b/config-templates/admin-env.properties
index 6c0c1244d97..b3ed94ed130 100644
--- a/config-templates/admin-env.properties
+++ b/config-templates/admin-env.properties
@@ -157,3 +157,10 @@ mosip.kernel.registrationcenterid.length=5
 
 mosip.kernel.audit.manager.api=https://<IP>:<PORT>/v1/auditmanager/audits
 mosip.kernel.masterdata.audit-url=https://<IP>:<PORT>/v1/auditmanager/audits
+
+mosip.kernel.packet-status-update-url=https://<IP>:<PORT>/registrationprocessor/v1/registrationtransaction/search
+mosip.kernel.zone-validation-url=https://<IP>:<PORT>/v1/masterdata/zones/authorize
+mosip.kernel.registrationcenterid.length=5 
+
+mosip.kernel.audit.manager.api=https://<IP>:<PORT>/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url=https://<IP>:<PORT>/v1/auditmanager/audits
diff --git a/config-templates/kernel-env.properties b/config-templates/kernel-env.properties
index 4b0ed427dec..c9be39e8e5d 100644
--- a/config-templates/kernel-env.properties
+++ b/config-templates/kernel-env.properties
@@ -352,4 +352,12 @@ mosip.keycloak.admin.client.id=<admin-cli client id>
 mosip.keycloak.admin.user.id=<admin-cli user id>
 mosip.keycloak.admin.secret.key=<admin-cli secret key>
 
+mosip.base.url={{ base_url }}
 
+master.search.maximum.rows=50
+mosip.level=2
+mosip.kernel.masterdata.audit-url=http://localhost:8081/v1/auditmanager/audits
+mosip.keycloak.max-no-of-users=20000
+
+mosip.kernel.sign-url=${mosip.base.url}/v1/signature/sign
+masterdata.registerdevice.timestamp.validate=+5
diff --git a/config-templates/pre-registration-env.properties b/config-templates/pre-registration-env.properties
index 27d6d287734..7822dccb5c8 100644
--- a/config-templates/pre-registration-env.properties
+++ b/config-templates/pre-registration-env.properties
@@ -70,16 +70,6 @@ booking.service.contextpath=preregistration/${booking.service.version}
 #Booking service URL
 booking.resource.url=${booking.service.env}/${booking.service.contextpath}
 
-#BatchJob-service version
-batch.service.version=v1
-
-#BatchJob-service context path
-batch.service.env=http://pre-registration-batchjob-service:9096
-batch.service.contextpath=preregistration/${batch.service.version}/batch
-
-#batchjob service URL
-batch.resource.url=${batch.service.env}/${batch.service.contextpath}
-
 #Notification service context path
 notification.service.version=v1
 notification.service.env=http://pre-registration-notification-service:9099
@@ -299,14 +289,8 @@ spring.batch.tablePrefix=PREREG.BATCH_
 #Booking service URL for creating time slots
 bookingAvailablity.url=${booking.resource.url}/appointment/availability/sync
 
-#BatchJob-service URL for updating the consumed status
-updateConsumedStatus.url=${batch.resource.url}/consumedStatus
-
-#BatchJob-service URL for updating to expiredStatus
-expiredStatus.url=${batch.resource.url}/expiredStatus
-
-#BatchJob-service cancel appointment URL
-batch.appointment.cancel=${batch.service.env}/preregistration/v1
+#Appointment Cancel
+batch.appointment.cancel=${booking.service.env}/${booking.service.contextpath}
 
 # ----------- BatchJob-Service--------
 
diff --git a/config-templates/registration-env.properties b/config-templates/registration-env.properties
index 0f85298943b..40303e8a79a 100644
--- a/config-templates/registration-env.properties
+++ b/config-templates/registration-env.properties
@@ -354,7 +354,7 @@ mosip.registration.cbeff_algorithm_org = HMAC
 mosip.registration.cbeff_algorithm_type = SHA-256
 
 #Minimum disk space required to create a packet(in MB)
-mosip.registration.disk_space_size=5 
+mosip.registration.disk_space_size=5
 
 #Current MDS version
 current_mdm_spec=0.9.2
diff --git a/config-templates/resident-env.properties b/config-templates/resident-env.properties
index 96fd6590083..c5efc4b86c7 100644
--- a/config-templates/resident-env.properties
+++ b/config-templates/resident-env.properties
@@ -64,4 +64,4 @@ resident.machine.id=20007
 
 #----------------------config data---------------------
 resident.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
-auth.types.allowed=demo,bio-FIR,bio-IIR,bio-FACE
+auth.types.allowed=otp,bio-FIR,bio-IIR,bio-FACE