From 537dadf0cca0446dd4d46edcb597c18668058c97 Mon Sep 17 00:00:00 2001 From: SanjaySinghRajpoot Date: Mon, 8 May 2023 23:13:08 +0530 Subject: [PATCH 1/4] fix: env file --- .env | 46 ---------------------------------------------- sample.env | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 .env create mode 100644 sample.env diff --git a/.env b/.env deleted file mode 100644 index 0f6cad59..00000000 --- a/.env +++ /dev/null @@ -1,46 +0,0 @@ -POSTGRES_USER=postgres -POSTGRES_PASSWORD=postgres -DATABASE_USERNAME=fusionauth -DATABASE_PASSWORD=hkaLBM3RVnyYeYeqE3WI1w2e4Avpy0Wd5O3s3 -ES_JAVA_OPTS="-Xms512m -Xmx512m" -FUSIONAUTH_APP_MEMORY=512M - -#minio -MINIO_USERNAME=workflow-dev -MINIO_PASSWORD=workflow-dev -MINIO_BUCKETNAME=affiliationbucket - -# central envs -CENTRAL_USER_EMAIL=chakshu@samagragovernance.in -CENTRAL_USER_PASS=StrongPassword@1234 - -#enketo-express -ENCRYPTION_KEY=somestrongencrytionkey -LESS_SECURE_ENCRYPTION_KEY=ssssomestrongencrytionkey -FORM_MANAGER_BASE_URI=IP:PORT_OF_DEPLOYED_INSTANCE - -# form manager -FORM_MANAGER_URL=http://form-manager:3006 -MINIO_URL=IP:PORT_OF_DEPLOYED_MINIO -MINIO_ENDPOINT=minio -MINIO_PORT=9000 -REDIS_HOST=fm-cache -MINIO_USE_SSL=false -REDIS_PORT=6379 - -# TSDB -TSDB_POSTGRES_USER=timescaledb -TSDB_POSTGRES_PASSWORD=postgrespassword - -# GQL -HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey -HASURA_GRAPHQL_JWT_SECRET={"type":"RS256","jwk_url":"http://fusionauth:9011/.well-known/jwks.json"} -HASURA_GRAPHQL_DATABASE_URL=postgres://$TSDB_POSTGRES_USER:$TSDB_POSTGRES_PASSWORD@tsdb:5432/postgres?sslmode=disable - -#react wrapper -# http://service-name is not going to work as we are building a static build -# and serving it through nginx -# use actual IP address instead -REACT_APP_ENKETO_URL=https://8065-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io -REACT_APP_FORM_MANAGER_URL=https://3006-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io -REACT_APP_HASURA_URL=https://8080-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io \ No newline at end of file diff --git a/sample.env b/sample.env new file mode 100644 index 00000000..df9c1ebf --- /dev/null +++ b/sample.env @@ -0,0 +1,46 @@ +POSTGRES_USER= +POSTGRES_PASSWORD= +DATABASE_USERNAME= +DATABASE_PASSWORD= +ES_JAVA_OPTS="" +FUSIONAUTH_APP_MEMORY= + +#minio +MINIO_USERNAME= +MINIO_PASSWORD= +MINIO_BUCKETNAME= + +# central envs +CENTRAL_USER_EMAIL= +CENTRAL_USER_PASS= + +#enketo-express +ENCRYPTION_KEY= +LESS_SECURE_ENCRYPTION_KEY= +FORM_MANAGER_BASE_URI= + +# form manager +FORM_MANAGER_URL= +MINIO_URL= +MINIO_ENDPOINT= +MINIO_PORT= +REDIS_HOST= +MINIO_USE_SSL= +REDIS_PORT= + +# TSDB +TSDB_POSTGRES_USER= +TSDB_POSTGRES_PASSWORD= + +# GQL +HASURA_GRAPHQL_ADMIN_SECRET= +HASURA_GRAPHQL_JWT_SECRET= +HASURA_GRAPHQL_DATABASE_URL= + +#react wrapper +# http://service-name is not going to work as we are building a static build +# and serving it through nginx +# use actual IP address instead +REACT_APP_ENKETO_URL= +REACT_APP_FORM_MANAGER_URL= +REACT_APP_HASURA_URL= \ No newline at end of file From e9c6c7f9c4478ca18fb7740b7300c3d7318c8d76 Mon Sep 17 00:00:00 2001 From: SanjaySinghRajpoot Date: Fri, 12 May 2023 13:27:06 +0530 Subject: [PATCH 2/4] automatic script for .env --- .gitpod.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index b11f6988..a53ccea7 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -14,11 +14,13 @@ tasks: init: | gp sync-done dev-setup bash install-central.sh + - name: generate env file + command: cp sample.env .env - name: Start Services openMode: tab-after init: | gp sync-done dev-setup - # Not needed now, we can use docker-compose networking.. but one can use this in a script to repalce env vars at runtime in .env + # Not needed now, we can use docker-compose networking.. but one can use this in a script to replace env vars at runtime in .env # sed -i~ "/^FORM_MANAGER_URL=/s/=.*/=https\:\/\/3006-${GITPOD_WORKSPACE_URL:8}/" .env sed -i~ "/^MINIO_URL=/s/=.*/=https\:\/\/9000-${GITPOD_WORKSPACE_URL:8}/" .env # sed -i~ "/^MINIO_ENDPOINT=/s/=.*/=9000-${GITPOD_WORKSPACE_URL:8}/" .env From f4f8d94db411933895d005e5baab446e5aba6f14 Mon Sep 17 00:00:00 2001 From: SanjaySinghRajpoot Date: Sat, 20 May 2023 15:15:43 +0530 Subject: [PATCH 3/4] feat: updated sample .env --- sample.env | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/sample.env b/sample.env index df9c1ebf..0f6cad59 100644 --- a/sample.env +++ b/sample.env @@ -1,46 +1,46 @@ -POSTGRES_USER= -POSTGRES_PASSWORD= -DATABASE_USERNAME= -DATABASE_PASSWORD= -ES_JAVA_OPTS="" -FUSIONAUTH_APP_MEMORY= +POSTGRES_USER=postgres +POSTGRES_PASSWORD=postgres +DATABASE_USERNAME=fusionauth +DATABASE_PASSWORD=hkaLBM3RVnyYeYeqE3WI1w2e4Avpy0Wd5O3s3 +ES_JAVA_OPTS="-Xms512m -Xmx512m" +FUSIONAUTH_APP_MEMORY=512M #minio -MINIO_USERNAME= -MINIO_PASSWORD= -MINIO_BUCKETNAME= +MINIO_USERNAME=workflow-dev +MINIO_PASSWORD=workflow-dev +MINIO_BUCKETNAME=affiliationbucket # central envs -CENTRAL_USER_EMAIL= -CENTRAL_USER_PASS= +CENTRAL_USER_EMAIL=chakshu@samagragovernance.in +CENTRAL_USER_PASS=StrongPassword@1234 #enketo-express -ENCRYPTION_KEY= -LESS_SECURE_ENCRYPTION_KEY= -FORM_MANAGER_BASE_URI= +ENCRYPTION_KEY=somestrongencrytionkey +LESS_SECURE_ENCRYPTION_KEY=ssssomestrongencrytionkey +FORM_MANAGER_BASE_URI=IP:PORT_OF_DEPLOYED_INSTANCE # form manager -FORM_MANAGER_URL= -MINIO_URL= -MINIO_ENDPOINT= -MINIO_PORT= -REDIS_HOST= -MINIO_USE_SSL= -REDIS_PORT= +FORM_MANAGER_URL=http://form-manager:3006 +MINIO_URL=IP:PORT_OF_DEPLOYED_MINIO +MINIO_ENDPOINT=minio +MINIO_PORT=9000 +REDIS_HOST=fm-cache +MINIO_USE_SSL=false +REDIS_PORT=6379 # TSDB -TSDB_POSTGRES_USER= -TSDB_POSTGRES_PASSWORD= +TSDB_POSTGRES_USER=timescaledb +TSDB_POSTGRES_PASSWORD=postgrespassword # GQL -HASURA_GRAPHQL_ADMIN_SECRET= -HASURA_GRAPHQL_JWT_SECRET= -HASURA_GRAPHQL_DATABASE_URL= +HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey +HASURA_GRAPHQL_JWT_SECRET={"type":"RS256","jwk_url":"http://fusionauth:9011/.well-known/jwks.json"} +HASURA_GRAPHQL_DATABASE_URL=postgres://$TSDB_POSTGRES_USER:$TSDB_POSTGRES_PASSWORD@tsdb:5432/postgres?sslmode=disable #react wrapper # http://service-name is not going to work as we are building a static build # and serving it through nginx # use actual IP address instead -REACT_APP_ENKETO_URL= -REACT_APP_FORM_MANAGER_URL= -REACT_APP_HASURA_URL= \ No newline at end of file +REACT_APP_ENKETO_URL=https://8065-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io +REACT_APP_FORM_MANAGER_URL=https://3006-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io +REACT_APP_HASURA_URL=https://8080-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io \ No newline at end of file From c68f80d108d5b4c576c842e3c33e1a7dd83aa665 Mon Sep 17 00:00:00 2001 From: SanjaySinghRajpoot Date: Sat, 20 May 2023 15:25:25 +0530 Subject: [PATCH 4/4] fix: secreat rotated --- sample.env | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/sample.env b/sample.env index 0f6cad59..f55ea98c 100644 --- a/sample.env +++ b/sample.env @@ -1,46 +1,46 @@ -POSTGRES_USER=postgres -POSTGRES_PASSWORD=postgres -DATABASE_USERNAME=fusionauth -DATABASE_PASSWORD=hkaLBM3RVnyYeYeqE3WI1w2e4Avpy0Wd5O3s3 -ES_JAVA_OPTS="-Xms512m -Xmx512m" -FUSIONAUTH_APP_MEMORY=512M +POSTGRES_USER=28f448d6b93682a5506057d00d8e2a4a +POSTGRES_PASSWORD=4a59d9a4f8b26b1a37b1307522dbee13 +DATABASE_USERNAME=e3adcb5f0ea9f9fabeef700dd1829062 +DATABASE_PASSWORD=adbbd84663d621d2c61a83511afbd586 +ES_JAVA_OPTS=b057fb1de7f0c4bfa9e3a47bfc5dddef +FUSIONAUTH_APP_MEMORY=e71241e3fd129482f17b65bcb1b0f7de #minio -MINIO_USERNAME=workflow-dev -MINIO_PASSWORD=workflow-dev -MINIO_BUCKETNAME=affiliationbucket +MINIO_USERNAME=7f1db5d6334a96d5081c727ed2da6d03 +MINIO_PASSWORD=18c85b04e71af95de84748e10d8d6d03 +MINIO_BUCKETNAME=e8835e98375209168c08e2dc32df364e # central envs -CENTRAL_USER_EMAIL=chakshu@samagragovernance.in -CENTRAL_USER_PASS=StrongPassword@1234 +CENTRAL_USER_EMAIL=3d204f11c916fb6e167f2e6f172c4629 +CENTRAL_USER_PASS=7089838567ab798fdff495d6291c4d1c #enketo-express -ENCRYPTION_KEY=somestrongencrytionkey +ENCRYPTION_KEY=fefb6f0e8c0db0baea77bfd18b871cfe LESS_SECURE_ENCRYPTION_KEY=ssssomestrongencrytionkey -FORM_MANAGER_BASE_URI=IP:PORT_OF_DEPLOYED_INSTANCE +FORM_MANAGER_BASE_URI=337171cf623c9a6250b1304b6771fe5e # form manager -FORM_MANAGER_URL=http://form-manager:3006 -MINIO_URL=IP:PORT_OF_DEPLOYED_MINIO -MINIO_ENDPOINT=minio +FORM_MANAGER_URL=83627096dfc8e466f5431f35ecc91872 +MINIO_URL=725ca1bfe02f4aae2e5ebb72855337d4 +MINIO_ENDPOINT=42db748e6c2d0d957e23c39b7a74118c MINIO_PORT=9000 -REDIS_HOST=fm-cache -MINIO_USE_SSL=false -REDIS_PORT=6379 +REDIS_HOST=c7c2496d8b558ea659e674c57668f40f +MINIO_USE_SSL=f3b8a3eb9cf0668f84bfdb024151879b +REDIS_PORT=e8c8bc8523b3a9a67a9768d01f636a0e # TSDB -TSDB_POSTGRES_USER=timescaledb -TSDB_POSTGRES_PASSWORD=postgrespassword +TSDB_POSTGRES_USER=bb6baf9253ebce19ce0f69197d4ce5t5 +TSDB_POSTGRES_PASSWORD=8bfe2ce98ba66be0093b9a5ca607cfc5 # GQL HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey -HASURA_GRAPHQL_JWT_SECRET={"type":"RS256","jwk_url":"http://fusionauth:9011/.well-known/jwks.json"} -HASURA_GRAPHQL_DATABASE_URL=postgres://$TSDB_POSTGRES_USER:$TSDB_POSTGRES_PASSWORD@tsdb:5432/postgres?sslmode=disable +HASURA_GRAPHQL_JWT_SECRET=529845d36519367203a8bbf5a0942ef4 +HASURA_GRAPHQL_DATABASE_URL=43034095d6066ab71c39d69d5b665d6a #react wrapper # http://service-name is not going to work as we are building a static build # and serving it through nginx # use actual IP address instead -REACT_APP_ENKETO_URL=https://8065-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io -REACT_APP_FORM_MANAGER_URL=https://3006-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io -REACT_APP_HASURA_URL=https://8080-tushar5526-workflow-0qffaj3egws.ws-us93.gitpod.io \ No newline at end of file +REACT_APP_ENKETO_URL=8f0e9922895e7a99d644fbe19be3841b +REACT_APP_FORM_MANAGER_URL=bcbb6baf9253ebce19ce0f69197d4ce5 +REACT_APP_HASURA_URL=91562e3d81f918b1c90d4ca3fb5a89e3