From e43fc7633ddde247129918f4aa92d4dee293ad1b Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 28 Jan 2025 15:06:58 +0100 Subject: [PATCH 1/3] add code to start.sh for building config --- deployment/bare_metal/start.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index 3fe99bd50..db59b0eed 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -145,6 +145,7 @@ find /tmp -name "yarn--*" -exec rm -r {} \; # Remove node_modules folders # we had problems with corrupted node_modules folder rm -Rf $PROJECT_ROOT/database/node_modules +rm -Rf $PROJECT_ROOT/config/node_modules rm -Rf $PROJECT_ROOT/backend/node_modules rm -Rf $PROJECT_ROOT/frontend/node_modules rm -Rf $PROJECT_ROOT/admin/node_modules @@ -154,6 +155,7 @@ rm -Rf $PROJECT_ROOT/federation/node_modules # Remove build folders # we had problems with corrupted incremtal builds rm -Rf $PROJECT_ROOT/database/build +rm -Rf $PROJECT_ROOT/config/build rm -Rf $PROJECT_ROOT/backend/build rm -Rf $PROJECT_ROOT/frontend/build rm -Rf $PROJECT_ROOT/admin/build @@ -186,6 +188,12 @@ else yarn up fi +# Install & build config +echo 'Updating config' >> $UPDATE_HTML +cd $PROJECT_ROOT/config +yarn install +yarn build + # Install & build backend echo 'Updating backend' >> $UPDATE_HTML cd $PROJECT_ROOT/backend From 5d2fb52d745cd1eaa9b0d73b07f9ac5cb19a5fec Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 28 Jan 2025 15:25:34 +0100 Subject: [PATCH 2/3] fix problem with meta_url --- frontend/.env.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/.env.template b/frontend/.env.template index 76b53c784..78d4f3a29 100644 --- a/frontend/.env.template +++ b/frontend/.env.template @@ -13,7 +13,7 @@ COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION COMMUNITY_SUPPORT_MAIL=$COMMUNITY_SUPPORT_MAIL # Meta -META_URL=$COMMUNITY_HOST +META_URL=https://$COMMUNITY_HOST META_TITLE_DE=$META_TITLE_DE META_TITLE_EN=$META_TITLE_EN META_DESCRIPTION_DE=$META_DESCRIPTION_DE From e82afcaff245c560e2a765505e7b037764484a56 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 28 Jan 2025 18:15:20 +0100 Subject: [PATCH 3/3] Update frontend/.env.template Co-authored-by: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> --- frontend/.env.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/.env.template b/frontend/.env.template index 78d4f3a29..9c51e03ca 100644 --- a/frontend/.env.template +++ b/frontend/.env.template @@ -13,7 +13,7 @@ COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION COMMUNITY_SUPPORT_MAIL=$COMMUNITY_SUPPORT_MAIL # Meta -META_URL=https://$COMMUNITY_HOST +META_URL=$URL_PROTOCOL://$COMMUNITY_HOST META_TITLE_DE=$META_TITLE_DE META_TITLE_EN=$META_TITLE_EN META_DESCRIPTION_DE=$META_DESCRIPTION_DE