Merge branch 'master' into add_config_in_deployment

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",

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')

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",

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
     }
+
   ]
 }

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"

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
     }
   ]
 }

frontend/.env.template

@@ -13,7 +13,7 @@ COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION
 COMMUNITY_SUPPORT_MAIL=$COMMUNITY_SUPPORT_MAIL
 
 # Meta
-META_URL=$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