diff --git a/config/app/variables/cli/cli.json b/config/app/variables/cli/cli.json index b9eeaf73c..816eb9f12 100644 --- a/config/app/variables/cli/cli.json +++ b/config/app/variables/cli/cli.json @@ -85,15 +85,6 @@ "describe": "URL of the SPARQL endpoint, when using a quadstore-based configuration." } }, - { - "@type": "YargsParameter", - "name": "podConfigJson", - "options": { - "requiresArg": true, - "type": "string", - "describe": "Path to the file that keeps track of dynamic Pod configurations." - } - }, { "@type": "YargsParameter", "name": "seededPodConfigJson", diff --git a/config/app/variables/resolver/resolver.json b/config/app/variables/resolver/resolver.json index 2341d0f6b..884d241d4 100644 --- a/config/app/variables/resolver/resolver.json +++ b/config/app/variables/resolver/resolver.json @@ -51,14 +51,6 @@ "defaultValue": false } }, - { - "CombinedShorthandResolver:_resolvers_key": "urn:solid-server:default:variable:podConfigJson", - "CombinedShorthandResolver:_resolvers_value": { - "@type": "AssetPathExtractor", - "key": "podConfigJson", - "defaultPath": "./pod-config.json" - } - }, { "CombinedShorthandResolver:_resolvers_key": "urn:solid-server:default:variable:seededPodConfigJson", "CombinedShorthandResolver:_resolvers_value": { diff --git a/config/identity/pod/dynamic.json b/config/identity/pod/dynamic.json index 4ab11eec1..41452fd4d 100644 --- a/config/identity/pod/dynamic.json +++ b/config/identity/pod/dynamic.json @@ -45,9 +45,9 @@ { "comment": "This is where the pod configurations will be stored.", "@id": "urn:solid-server:default:PodConfigurationStorage", - "@type": "JsonFileStorage", - "filePath": { "@id": "urn:solid-server:default:variable:podConfigJson" }, - "locker": { "@id": "urn:solid-server:default:ResourceLocker" } + "@type": "EncodingPathStorage", + "relativePath": "/dynamic-pods/configs/", + "source": { "@id": "urn:solid-server:default:KeyValueStorage" } }, { diff --git a/config/util/variables/default.json b/config/util/variables/default.json index ec3767640..4cfab2aaa 100644 --- a/config/util/variables/default.json +++ b/config/util/variables/default.json @@ -32,11 +32,6 @@ "@id": "urn:solid-server:default:variable:showStackTrace", "@type": "Variable" }, - { - "comment": "Path to the JSON file used to store configuration for dynamic pods.", - "@id": "urn:solid-server:default:variable:podConfigJson", - "@type": "Variable" - }, { "comment": "Path to the JSON file used to seed pods.", "@id": "urn:solid-server:default:variable:seededPodConfigJson", diff --git a/src/pods/generate/TemplatedPodGenerator.ts b/src/pods/generate/TemplatedPodGenerator.ts index 84883eb7b..6c8902087 100644 --- a/src/pods/generate/TemplatedPodGenerator.ts +++ b/src/pods/generate/TemplatedPodGenerator.ts @@ -4,14 +4,14 @@ import type { KeyValueStorage } from '../../storage/keyvalue/KeyValueStorage'; import type { ResourceStore } from '../../storage/ResourceStore'; import { BadRequestHttpError } from '../../util/errors/BadRequestHttpError'; import { ConflictHttpError } from '../../util/errors/ConflictHttpError'; -import { joinFilePath } from '../../util/PathUtil'; +import { joinFilePath, modulePathPlaceholder, resolveAssetPath } from '../../util/PathUtil'; import type { PodSettings } from '../settings/PodSettings'; import type { ComponentsJsFactory } from './ComponentsJsFactory'; import type { PodGenerator } from './PodGenerator'; import type { VariableHandler } from './variables/VariableHandler'; import { isValidVariable, TEMPLATE, TEMPLATE_VARIABLE } from './variables/Variables'; -const DEFAULT_CONFIG_PATH = joinFilePath(__dirname, '../../../templates/config/'); +const DEFAULT_CONFIG_PATH = resolveAssetPath(`${modulePathPlaceholder}/templates/config/`); /** * Creates a new ResourceStore when creating a pod based on a Components.js configuration.