From 5d2fb52d745cd1eaa9b0d73b07f9ac5cb19a5fec Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 28 Jan 2025 15:25:34 +0100 Subject: [PATCH 1/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 92587cca8e635145cee670bdfba0fe6ca203bb30 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 28 Jan 2025 16:51:28 +0100 Subject: [PATCH 2/3] fix dht-node and federation using config in bare-metal setup --- config/package.json | 3 ++- config/src/commonSchema.ts | 2 +- dht-node/package.json | 2 +- dht-node/tsconfig.json | 8 +++++++- dht-node/yarn.lock | 4 ++-- federation/tsconfig.json | 7 ++++++- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/config/package.json b/config/package.json index f2d12e58e..82432d20c 100644 --- a/config/package.json +++ b/config/package.json @@ -2,7 +2,8 @@ "name": "gradido-config", "version": "1.0.0", "description": "Gradido Config for validate config", - "main": "src/index.ts", + "main": "build/src/index.js", + "types": "build/src/index.d.ts", "repository": "https://github.com/gradido/gradido/config", "author": "einhornimmond", "license": "Apache-2.0", diff --git a/config/src/commonSchema.ts b/config/src/commonSchema.ts index 484d4bab6..1cf9f429c 100644 --- a/config/src/commonSchema.ts +++ b/config/src/commonSchema.ts @@ -146,7 +146,7 @@ export const LOGIN_SERVER_KEY = Joi.string() .required() export const TYPEORM_LOGGING_RELATIVE_PATH = Joi.string() - .pattern(/^[a-zA-Z0-9-_\.]+\.log$/) + .pattern(new RegExp('^[a-zA-Z0-9-_\./]+\.log$')) .message('TYPEORM_LOGGING_RELATIVE_PATH must be a valid filename ending with .log') .description('log file name for logging typeorm activities') .default('typeorm.log') diff --git a/dht-node/package.json b/dht-node/package.json index e9c006bfd..2b6ecee15 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -19,6 +19,7 @@ "@hyperswarm/dht": "^6.4.4", "cross-env": "^7.0.3", "dotenv": "10.0.0", + "gradido-config": "file:../config", "gradido-database": "file:../database", "joi": "^17.13.3", "log4js": "^6.7.1", @@ -45,7 +46,6 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-security": "^1.7.1", - "gradido-config": "../config", "jest": "^27.2.4", "prettier": "^2.8.7", "ts-jest": "^27.0.5", diff --git a/dht-node/tsconfig.json b/dht-node/tsconfig.json index 0caefb6e5..580319573 100644 --- a/dht-node/tsconfig.json +++ b/dht-node/tsconfig.json @@ -54,7 +54,7 @@ "@dbTools/*": ["../database/src/*", "../../database/build/src/*"], "@entity/*": ["../database/entity/*", "../../database/build/entity/*"], "@logging/*": ["../database/logging/*", "../../database/build/logging/*"], - "@config/*": ["../config/src/*", "../../config/build/*"] + "@config/*": ["../config/src/*", "../../config/build/src/*"] }, // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ "typeRoots": ["src/dht_node/@types", "node_modules/@types"], /* List of folders to include type definitions from. */ @@ -83,6 +83,12 @@ "path": "../database/tsconfig.json", // add 'prepend' if you want to include the referenced project in your output file // "prepend": true + }, + { + "path": "../config/tsconfig.json", + // add 'prepend' if you want to include the referenced project in your output file + // "prepend": true } + ] } diff --git a/dht-node/yarn.lock b/dht-node/yarn.lock index b4292a644..9f103fbe6 100644 --- a/dht-node/yarn.lock +++ b/dht-node/yarn.lock @@ -2429,13 +2429,13 @@ graceful-fs@^4.2.4: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== -gradido-config@../config: +"gradido-config@file:../config": version "1.0.0" dependencies: joi "^17.13.3" "gradido-database@file:../database": - version "2.4.1" + version "2.4.4" dependencies: "@types/uuid" "^8.3.4" cross-env "^7.0.3" diff --git a/federation/tsconfig.json b/federation/tsconfig.json index d9c642232..1a180f99f 100644 --- a/federation/tsconfig.json +++ b/federation/tsconfig.json @@ -62,7 +62,7 @@ "@dbTools/*": ["../database/src/*", "../../database/build/src/*"], "@entity/*": ["../database/entity/*", "../../database/build/entity/*"], "@logging/*": ["../database/logging/*", "../../database/build/logging/*"], - "@config/*": ["../config/src/*", "../../config/build/*"] + "@config/*": ["../config/src/*", "../../config/build/src/*"] }, // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ "typeRoots": ["node_modules/@types"], /* List of folders to include type definitions from. */ @@ -91,6 +91,11 @@ "path": "../database/tsconfig.json", // add 'prepend' if you want to include the referenced project in your output file // "prepend": true + }, + { + "path": "../config/tsconfig.json", + // add 'prepend' if you want to include the referenced project in your output file + // "prepend": true } ] } 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