From 1e4c84c42b6e0fcd07bec8b439874fc30d983c47 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:27:56 +0100 Subject: [PATCH 01/12] Update deployment/bare_metal/.env.dist Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/.env.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index 12297e357..da745d705 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -66,7 +66,7 @@ FEDERATION_COMMUNITY_URL=http://stage1.gradido.net FEDERATION_COMMUNITY_API_PORT=5000 FEDERATION_CONFIG_VERSION=v1.2023-01-09 -# comma separated list of api-versions, which cause starting several federation moduls +# comma separated list of api-versions, which cause starting several federation modules FEDERATION_COMMUNITY_APIS=1_0,1_1,2_0 # database From 78d74d362c8bd144ec74883a9192f5bbd73376ab Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:35:00 +0100 Subject: [PATCH 02/12] Update deployment/bare_metal/start.sh Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index d82bcbe9b..c1e8ab3a8 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -59,7 +59,7 @@ ln -s /etc/nginx/sites-available/update-page.conf /etc/nginx/sites-enabled/ sudo /etc/init.d/nginx restart # stop all services -echo 'Stopping and Delete all Gradido services' >> $UPDATE_HTML +echo 'Stop and delete all Gradido services' >> $UPDATE_HTML pm2 delete all pm2 save From 633e34eb8b04b44ee1d1a4b83f7b889c19a85ee4 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:35:39 +0100 Subject: [PATCH 03/12] Update deployment/bare_metal/start.sh Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index c1e8ab3a8..63f206c1b 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -78,7 +78,7 @@ export BUILD_COMMIT="$(git rev-parse HEAD)" # *** set FEDERATION_PORT from FEDERATION_COMMUNITY_APIS and create gradido-federation.conf file rm -f $NGINX_CONFIG_DIR/gradido.conf.tmp rm -f $NGINX_CONFIG_DIR/gradido-federation.conf -echo "====================================================================================================" +echo "====================================================================================================" >> $UPDATE_HTML IFS="," read -a API_ARRAY <<< $FEDERATION_COMMUNITY_APIS for api in "${API_ARRAY[@]}" do From 931cd400680a582787912b790a25387b6b33912c Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:36:07 +0100 Subject: [PATCH 04/12] Update deployment/bare_metal/start.sh Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 63f206c1b..5375b6d2e 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -88,7 +88,7 @@ do FEDERATION_PORT=${FEDERATION_COMMUNITY_API_PORT:-5000} FEDERATION_PORT=$(($FEDERATION_PORT + $port)) export FEDERATION_PORT - echo " create ngingx config: location /api/$FEDERATION_APIVERSION to http://127.0.0.1:$FEDERATION_PORT" + echo "create ngingx config: location /api/$FEDERATION_APIVERSION to http://127.0.0.1:$FEDERATION_PORT" >> $UPDATE_HTML envsubst '$FEDERATION_APIVERSION, $FEDERATION_PORT' < $NGINX_CONFIG_DIR/gradido-federation.conf.template >> $NGINX_CONFIG_DIR/gradido-federation.conf done export FEDERATION_APIVERSION= From 36518a636a0dd2a488b22ff062de97a170382047 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:37:09 +0100 Subject: [PATCH 05/12] Update deployment/bare_metal/start.sh Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 5375b6d2e..641999a45 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -91,8 +91,8 @@ do echo "create ngingx config: location /api/$FEDERATION_APIVERSION to http://127.0.0.1:$FEDERATION_PORT" >> $UPDATE_HTML envsubst '$FEDERATION_APIVERSION, $FEDERATION_PORT' < $NGINX_CONFIG_DIR/gradido-federation.conf.template >> $NGINX_CONFIG_DIR/gradido-federation.conf done -export FEDERATION_APIVERSION= -export FEDERATION_PORT= +unset FEDERATION_APIVERSION +unset FEDERATION_PORT echo "====================================================================================================" # *** 2nd read gradido-federation.conf file in env variable to be replaced in 3rd step From 7dbf7ecc993ef3b4b82fe4427640bcf22ba48d86 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:37:33 +0100 Subject: [PATCH 06/12] Update deployment/bare_metal/start.sh Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 641999a45..96bc3fb3d 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -93,7 +93,7 @@ do done unset FEDERATION_APIVERSION unset FEDERATION_PORT -echo "====================================================================================================" +echo "====================================================================================================" >> $UPDATE_HTML # *** 2nd read gradido-federation.conf file in env variable to be replaced in 3rd step export FEDERATION_NGINX_CONF=$(< $NGINX_CONFIG_DIR/gradido-federation.conf) From f799c56afce642d173427a59843220f8db996440 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:44:50 +0100 Subject: [PATCH 07/12] Update deployment/bare_metal/start.sh Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 96bc3fb3d..92773f496 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -200,9 +200,9 @@ if [ ! -z $FEDERATION_DHT_TOPIC ]; then pm2 start --name gradido-dht-node "yarn --cwd $PROJECT_ROOT/dht-node start" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save else - echo "=====================================================================" - echo "WARNING: FEDERATION_DHT_TOPIC not configured. DHT-Node not started..." - echo "=====================================================================" + echo "=====================================================================" >> $UPDATE_HTML + echo "WARNING: FEDERATION_DHT_TOPIC not configured. DHT-Node not started..." >> $UPDATE_HTML + echo "=====================================================================" >> $UPDATE_HTML fi From 9a2890351178d553266de4a152bcc5356dca847f Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:45:15 +0100 Subject: [PATCH 08/12] Update deployment/bare_metal/start.sh Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 92773f496..46e814ee0 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -221,7 +221,7 @@ IFS="," read -a API_ARRAY <<< $FEDERATION_COMMUNITY_APIS for api in "${API_ARRAY[@]}" do export FEDERATION_API=$api - echo "FEDERATION_API=$FEDERATION_API" + echo "FEDERATION_API=$FEDERATION_API" >> $UPDATE_HTML export MODULENAME=gradido-federation-$api echo "MODULENAME=$MODULENAME" # calculate port by remove '_' and add value of api to baseport From 5fbf8613c540bccb21f7d3f131b3b55f0453da07 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:45:47 +0100 Subject: [PATCH 09/12] Update deployment/bare_metal/start.sh Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 46e814ee0..4408431c1 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -223,7 +223,7 @@ do export FEDERATION_API=$api echo "FEDERATION_API=$FEDERATION_API" >> $UPDATE_HTML export MODULENAME=gradido-federation-$api - echo "MODULENAME=$MODULENAME" + echo "MODULENAME=$MODULENAME" >> $UPDATE_HTML # calculate port by remove '_' and add value of api to baseport port=${api//_/} FEDERATION_PORT=${FEDERATION_COMMUNITY_API_PORT:-5000} From 53566cc8c5e69ca312a88db8ed0902aaee658829 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Mon, 6 Mar 2023 14:46:32 +0100 Subject: [PATCH 10/12] Update deployment/bare_metal/start.sh Co-authored-by: Ulf Gebhardt --- deployment/bare_metal/start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 4408431c1..90b743417 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -229,9 +229,9 @@ do FEDERATION_PORT=${FEDERATION_COMMUNITY_API_PORT:-5000} FEDERATION_PORT=$(($FEDERATION_PORT + $port)) export FEDERATION_PORT - echo "====================================================" - echo " start $MODULENAME listening on port=$FEDERATION_PORT" - echo "====================================================" + echo "====================================================" >> $UPDATE_HTML + echo " start $MODULENAME listening on port=$FEDERATION_PORT" >> $UPDATE_HTML + echo "====================================================" >> $UPDATE_HTML # pm2 delete $MODULENAME pm2 start --name $MODULENAME "yarn --cwd $PROJECT_ROOT/federation start" -l $GRADIDO_LOG_PATH/pm2.$MODULENAME.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save From 569b3e0d7d8b928249bc374290df3a43efd8af50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Mon, 6 Mar 2023 16:08:59 +0100 Subject: [PATCH 11/12] rework PR-comments --- deployment/bare_metal/start.sh | 12 ++++-------- federation/.env.dist | 14 +++----------- federation/.env.dist.template | 11 ++++++----- federation/src/config/index.ts | 20 -------------------- 4 files changed, 13 insertions(+), 44 deletions(-) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 90b743417..aee21fbee 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -77,7 +77,7 @@ export BUILD_COMMIT="$(git rev-parse HEAD)" # *** 1st prepare for each apiversion the federation conf for nginx from federation-template # *** set FEDERATION_PORT from FEDERATION_COMMUNITY_APIS and create gradido-federation.conf file rm -f $NGINX_CONFIG_DIR/gradido.conf.tmp -rm -f $NGINX_CONFIG_DIR/gradido-federation.conf +rm -f $NGINX_CONFIG_DIR/gradido-federation.conf.locations echo "====================================================================================================" >> $UPDATE_HTML IFS="," read -a API_ARRAY <<< $FEDERATION_COMMUNITY_APIS for api in "${API_ARRAY[@]}" @@ -89,14 +89,14 @@ do FEDERATION_PORT=$(($FEDERATION_PORT + $port)) export FEDERATION_PORT echo "create ngingx config: location /api/$FEDERATION_APIVERSION to http://127.0.0.1:$FEDERATION_PORT" >> $UPDATE_HTML - envsubst '$FEDERATION_APIVERSION, $FEDERATION_PORT' < $NGINX_CONFIG_DIR/gradido-federation.conf.template >> $NGINX_CONFIG_DIR/gradido-federation.conf + envsubst '$FEDERATION_APIVERSION, $FEDERATION_PORT' < $NGINX_CONFIG_DIR/gradido-federation.conf.template >> $NGINX_CONFIG_DIR/gradido-federation.conf.locations done unset FEDERATION_APIVERSION unset FEDERATION_PORT echo "====================================================================================================" >> $UPDATE_HTML # *** 2nd read gradido-federation.conf file in env variable to be replaced in 3rd step -export FEDERATION_NGINX_CONF=$(< $NGINX_CONFIG_DIR/gradido-federation.conf) +export FEDERATION_NGINX_CONF=$(< $NGINX_CONFIG_DIR/gradido-federation.conf.locations) # *** 3rd generate gradido nginx config including federation modules per api-version echo 'Generate new gradido nginx config' >> $UPDATE_HTML @@ -108,7 +108,7 @@ envsubst '$FEDERATION_NGINX_CONF' < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CO export FEDERATION_NGINX_CONF= envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/gradido.conf.tmp > $NGINX_CONFIG_DIR/gradido.conf rm $NGINX_CONFIG_DIR/gradido.conf.tmp -rm $NGINX_CONFIG_DIR/gradido-federation.conf +rm $NGINX_CONFIG_DIR/gradido-federation.conf.locations # Generate update-page.conf from template echo 'Generate new update-page nginx config' >> $UPDATE_HTML @@ -156,7 +156,6 @@ if [ "$DEPLOY_SEED_DATA" = "true" ]; then fi # TODO maybe handle this differently? export NODE_ENV=production -# pm2 delete gradido-backend pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save @@ -169,7 +168,6 @@ yarn install yarn build # TODO maybe handle this differently? export NODE_ENV=production -# pm2 delete gradido-frontend pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save @@ -182,7 +180,6 @@ yarn install yarn build # TODO maybe handle this differently? export NODE_ENV=production -# pm2 delete gradido-admin pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save @@ -195,7 +192,6 @@ yarn install yarn build # TODO maybe handle this differently? export NODE_ENV=production -# pm2 delete gradido-dht-node if [ ! -z $FEDERATION_DHT_TOPIC ]; then pm2 start --name gradido-dht-node "yarn --cwd $PROJECT_ROOT/dht-node start" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save diff --git a/federation/.env.dist b/federation/.env.dist index 2bbf77fa8..68cedd5bb 100644 --- a/federation/.env.dist +++ b/federation/.env.dist @@ -1,15 +1,7 @@ -LOG_LEVEL=debug -PORT=4000 -GRAPHIQL=true - # Database -DB_PORT=3306 -DB_DATABASE=gradido_community - - -COMMUNITY_NAME=Gradido Entwicklung -COMMUNITY_URL=http://localhost:4000/ -COMMUNITY_DESCRIPTION=lokale Entwicklungsumgebung +# DB_HOST=localhost +# DB_PORT=3306 +# DB_DATABASE=gradido_community # Federation FEDERATION_API=1_0 diff --git a/federation/.env.dist.template b/federation/.env.dist.template index 336da8f1a..63185117b 100644 --- a/federation/.env.dist.template +++ b/federation/.env.dist.template @@ -1,14 +1,15 @@ +CONFIG_VERSION=$FEDERATION_CONFIG_VERSION + LOG_LEVEL=$LOG_LEVEL -PORT=$PORT GRAPHIQL=$GRAPHIQL # Database +DB_HOST=$DB_HOST DB_PORT=$DB_PORT DB_DATABASE=$DB_DATABASE - -COMMUNITY_NAME=$COMMUNITY_NAME -COMMUNITY_URL=$COMMUNITY_URL -COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION +DB_USER=$DB_USER +DB_PASSWORD=$DB_PASSWORD +DB_DATABASE=$DB_DATABASE # Federation FEDERATION_API=$FEDERATION_API diff --git a/federation/src/config/index.ts b/federation/src/config/index.ts index dc2e77928..e9036fc49 100644 --- a/federation/src/config/index.ts +++ b/federation/src/config/index.ts @@ -24,7 +24,6 @@ const constants = { } const server = { - PORT: process.env.PORT || 5010, // JWT_SECRET: process.env.JWT_SECRET || 'secret123', // JWT_EXPIRES_IN: process.env.JWT_EXPIRES_IN || '10m', GRAPHIQL: process.env.GRAPHIQL === 'true' || false, @@ -40,21 +39,6 @@ const database = { TYPEORM_LOGGING_RELATIVE_PATH: process.env.TYPEORM_LOGGING_RELATIVE_PATH || 'typeorm.backend.log', } -/* -const community = { - COMMUNITY_NAME: process.env.COMMUNITY_NAME || 'Gradido Entwicklung', - COMMUNITY_URL: process.env.COMMUNITY_URL || 'http://localhost/', - COMMUNITY_REGISTER_URL: process.env.COMMUNITY_REGISTER_URL || 'http://localhost/register', - COMMUNITY_REDEEM_URL: process.env.COMMUNITY_REDEEM_URL || 'http://localhost/redeem/{code}', - COMMUNITY_REDEEM_CONTRIBUTION_URL: - process.env.COMMUNITY_REDEEM_CONTRIBUTION_URL || 'http://localhost/redeem/CL-{code}', - COMMUNITY_DESCRIPTION: - process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.', -} -*/ - -// This is needed by graphql-directive-auth -// process.env.APP_SECRET = server.JWT_SECRET // Check config version constants.CONFIG_VERSION.CURRENT = @@ -71,10 +55,6 @@ if ( } const federation = { - // FEDERATION_DHT_TOPIC: process.env.FEDERATION_DHT_TOPIC || null, - // FEDERATION_DHT_SEED: process.env.FEDERATION_DHT_SEED || null, - // FEDERATION_COMMUNITY_API_PORT: - // process.env.FEDERATION_COMMUNITY_API_PORT || 5000, FEDERATION_API: process.env.FEDERATION_API || '1_0', FEDERATION_PORT: process.env.FEDERATION_PORT || 5010, FEDERATION_COMMUNITY_URL: process.env.FEDERATION_COMMUNITY_URL || null, From 8b64fb810ac5d2b9ac564ba3445d92e05d8e3df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Mon, 6 Mar 2023 21:56:40 +0100 Subject: [PATCH 12/12] rework PR-comments --- federation/.env.dist.template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/federation/.env.dist.template b/federation/.env.dist.template index 63185117b..780779722 100644 --- a/federation/.env.dist.template +++ b/federation/.env.dist.template @@ -1,7 +1,8 @@ CONFIG_VERSION=$FEDERATION_CONFIG_VERSION LOG_LEVEL=$LOG_LEVEL -GRAPHIQL=$GRAPHIQL +# this is set fix to false, because it is important for 'production' environments. only set to true if a graphql-playground should be in use +GRAPHIQL=false # Database DB_HOST=$DB_HOST