From d8abb73cdbe47e4e69720cb1e7202ee580a8bf3e Mon Sep 17 00:00:00 2001 From: Abhi Date: Wed, 20 May 2026 14:51:11 +0530 Subject: [PATCH 1/2] [MOSIP-37808] Updated DB attributes of MOSIP esignet Signed-off-by: Abhi --- db_scripts/init_values.yaml | 11 ++++++++--- db_scripts/mosip_esignet/db.sql | 4 ++-- db_scripts/mosip_esignet/ddl.sql | 2 +- db_scripts/mosip_esignet/deploy.properties | 1 + db_scripts/mosip_esignet/deploy.sh | 14 +++++++------- db_scripts/mosip_esignet/dml.sql | 2 +- db_scripts/mosip_esignet/drop_db.sql | 2 +- db_scripts/mosip_esignet/drop_role.sql | 2 +- db_scripts/mosip_esignet/grants.sql | 12 ++++++------ db_scripts/mosip_esignet/role_dbuser.sql | 2 +- 10 files changed, 29 insertions(+), 23 deletions(-) diff --git a/db_scripts/init_values.yaml b/db_scripts/init_values.yaml index 3bd82f201..347b9e581 100644 --- a/db_scripts/init_values.yaml +++ b/db_scripts/init_values.yaml @@ -3,8 +3,12 @@ dbUserPasswords: databases: mosip_esignet: - enabled: true - host: "postgres-postgresql.postgres" + enabled: false + scriptsDir: mosip_esignet # fixed - must match db_scripts/ folder in repo + dbName: mosip_esignet # customize e.g. mosip_esignet02 + dbUser: esignetuser # customize e.g. esignetuser02 + defaultDb: postgres + host: "postgres-postgresql" port: 5432 su: user: postgres @@ -12,4 +16,5 @@ databases: name: postgres-postgresql key: postgres-password dml: 1 - branch: develop + repoUrl: https://github.com/mosip/esignet.git + branch: develop \ No newline at end of file diff --git a/db_scripts/mosip_esignet/db.sql b/db_scripts/mosip_esignet/db.sql index 42e3331b9..e9ff51a4d 100644 --- a/db_scripts/mosip_esignet/db.sql +++ b/db_scripts/mosip_esignet/db.sql @@ -1,4 +1,4 @@ -CREATE DATABASE mosip_esignet +CREATE DATABASE :mosipdbname ENCODING = 'UTF8' LC_COLLATE = 'en_US.UTF-8' LC_CTYPE = 'en_US.UTF-8' @@ -13,5 +13,5 @@ COMMENT ON DATABASE mosip_esignet IS 'e-Signet related data is stored in this da DROP SCHEMA IF EXISTS esignet CASCADE; CREATE SCHEMA esignet; ALTER SCHEMA esignet OWNER TO postgres; -ALTER DATABASE mosip_esignet SET search_path TO esignet,pg_catalog,public; +ALTER DATABASE :mosipdbname SET search_path TO esignet,pg_catalog,public; diff --git a/db_scripts/mosip_esignet/ddl.sql b/db_scripts/mosip_esignet/ddl.sql index 00eafbd9f..cf3408051 100644 --- a/db_scripts/mosip_esignet/ddl.sql +++ b/db_scripts/mosip_esignet/ddl.sql @@ -1,4 +1,4 @@ -\c mosip_esignet +\c :mosipdbname \ir ddl/esignet-client_detail.sql \ir ddl/esignet-key_alias.sql diff --git a/db_scripts/mosip_esignet/deploy.properties b/db_scripts/mosip_esignet/deploy.properties index 759c58d44..f63e89316 100644 --- a/db_scripts/mosip_esignet/deploy.properties +++ b/db_scripts/mosip_esignet/deploy.properties @@ -3,4 +3,5 @@ DB_PORT=5432 SU_USER=postgres DEFAULT_DB_NAME=postgres MOSIP_DB_NAME=mosip_esignet +DB_UNAME=esignetuser DML_FLAG=1 diff --git a/db_scripts/mosip_esignet/deploy.sh b/db_scripts/mosip_esignet/deploy.sh index 7a06fcc04..e735b150d 100644 --- a/db_scripts/mosip_esignet/deploy.sh +++ b/db_scripts/mosip_esignet/deploy.sh @@ -31,23 +31,23 @@ CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --hos echo "Terminated connections" ## Drop db and role -PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql -PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_db.sql -v mosipdbname=$MOSIP_DB_NAME +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f drop_role.sql -v dbuname=$DB_UNAME ## Create users echo `date "+%m/%d/%Y %H:%M:%S"` ": Creating database users" | tee -PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\' +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f role_dbuser.sql -v dbuserpwd=\'$DBUSER_PWD\' -v dbuname=$DB_UNAME ## Create DB -PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql -PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f db.sql -v mosipdbname=$MOSIP_DB_NAME +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f ddl.sql -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME ## Grants -PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql +PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -f grants.sql -v mosipdbname=$MOSIP_DB_NAME -v dbuname=$DB_UNAME ## Populate tables if [ ${DML_FLAG} == 1 ] then echo `date "+%m/%d/%Y %H:%M:%S"` ": Deploying DML for ${MOSIP_DB_NAME} database" - PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f dml.sql + PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f dml.sql -v mosipdbname=$MOSIP_DB_NAME fi diff --git a/db_scripts/mosip_esignet/dml.sql b/db_scripts/mosip_esignet/dml.sql index 2950e1bf0..5728cfaae 100644 --- a/db_scripts/mosip_esignet/dml.sql +++ b/db_scripts/mosip_esignet/dml.sql @@ -1,4 +1,4 @@ -\c mosip_esignet +\c :mosipdbname ----- TRUNCATE esignet.client_detail TABLE Data and It's reference Data and insert data from sql file ----- TRUNCATE TABLE esignet.client_detail cascade ; diff --git a/db_scripts/mosip_esignet/drop_db.sql b/db_scripts/mosip_esignet/drop_db.sql index 31a93df54..36d0a024c 100644 --- a/db_scripts/mosip_esignet/drop_db.sql +++ b/db_scripts/mosip_esignet/drop_db.sql @@ -1,2 +1,2 @@ -DROP DATABASE IF EXISTS mosip_esignet; +DROP DATABASE IF EXISTS :mosipdbname; diff --git a/db_scripts/mosip_esignet/drop_role.sql b/db_scripts/mosip_esignet/drop_role.sql index 7b90c0246..0f6cc8f54 100644 --- a/db_scripts/mosip_esignet/drop_role.sql +++ b/db_scripts/mosip_esignet/drop_role.sql @@ -1 +1 @@ -drop role if exists esignetuser; +drop role if exists :dbuname; diff --git a/db_scripts/mosip_esignet/grants.sql b/db_scripts/mosip_esignet/grants.sql index 892a4b835..e2d0b3123 100644 --- a/db_scripts/mosip_esignet/grants.sql +++ b/db_scripts/mosip_esignet/grants.sql @@ -1,17 +1,17 @@ -\c mosip_esignet +\c :mosipdbname GRANT CONNECT - ON DATABASE mosip_esignet - TO esignetuser; + ON DATABASE :mosipdbname + TO :dbuname; GRANT USAGE ON SCHEMA esignet - TO esignetuser; + TO :dbuname; GRANT SELECT,INSERT,UPDATE,DELETE,TRUNCATE,REFERENCES ON ALL TABLES IN SCHEMA esignet - TO esignetuser; + TO :dbuname; ALTER DEFAULT PRIVILEGES IN SCHEMA esignet - GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO esignetuser; + GRANT SELECT,INSERT,UPDATE,DELETE,REFERENCES ON TABLES TO :dbuname; diff --git a/db_scripts/mosip_esignet/role_dbuser.sql b/db_scripts/mosip_esignet/role_dbuser.sql index 3934b76dd..a84bca180 100644 --- a/db_scripts/mosip_esignet/role_dbuser.sql +++ b/db_scripts/mosip_esignet/role_dbuser.sql @@ -1,4 +1,4 @@ -CREATE ROLE esignetuser WITH +CREATE ROLE :dbuname WITH INHERIT LOGIN PASSWORD :dbuserpwd; From 6e9c0fa3ffe388592c3e1358730a616c827ef4e7 Mon Sep 17 00:00:00 2001 From: Abhishek S <127825992+abhishek8shankar@users.noreply.github.com> Date: Wed, 20 May 2026 16:06:49 +0530 Subject: [PATCH 2/2] [MOSIP-37808] Updated DB attributes of MOSIP esignet Signed-off-by: Abhishek S <127825992+abhishek8shankar@users.noreply.github.com> --- db_scripts/init_values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_scripts/init_values.yaml b/db_scripts/init_values.yaml index 347b9e581..bbae8c210 100644 --- a/db_scripts/init_values.yaml +++ b/db_scripts/init_values.yaml @@ -3,7 +3,7 @@ dbUserPasswords: databases: mosip_esignet: - enabled: false + enabled: true scriptsDir: mosip_esignet # fixed - must match db_scripts/ folder in repo dbName: mosip_esignet # customize e.g. mosip_esignet02 dbUser: esignetuser # customize e.g. esignetuser02 @@ -17,4 +17,4 @@ databases: key: postgres-password dml: 1 repoUrl: https://github.com/mosip/esignet.git - branch: develop \ No newline at end of file + branch: develop