From 0b4204f9832d2616e87959b6b547958b5c8677fb Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 16 Jan 2018 08:46:44 +0100 Subject: Fix config storage paths --- server/initializers/constants.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 2c64efe1f..745e50168 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -5,7 +5,7 @@ import { ActivityPubActorType } from '../../shared/models/activitypub' import { FollowState } from '../../shared/models/actors' import { VideoPrivacy } from '../../shared/models/videos' // Do not use barrels, remain constants as independent as possible -import { isTestInstance, root, sanitizeHost, sanitizeUrl } from '../helpers/core-utils' +import { buildPath, isTestInstance, root, sanitizeHost, sanitizeUrl } from '../helpers/core-utils' // --------------------------------------------------------------------------- @@ -93,13 +93,13 @@ const CONFIG = { PASSWORD: config.get('database.password') }, STORAGE: { - AVATARS_DIR: join(root(), config.get('storage.avatars')), - LOG_DIR: join(root(), config.get('storage.logs')), - VIDEOS_DIR: join(root(), config.get('storage.videos')), - THUMBNAILS_DIR: join(root(), config.get('storage.thumbnails')), - PREVIEWS_DIR: join(root(), config.get('storage.previews')), - TORRENTS_DIR: join(root(), config.get('storage.torrents')), - CACHE_DIR: join(root(), config.get('storage.cache')) + AVATARS_DIR: buildPath(config.get('storage.avatars')), + LOG_DIR: buildPath(config.get('storage.logs')), + VIDEOS_DIR: buildPath(config.get('storage.videos')), + THUMBNAILS_DIR: buildPath(config.get('storage.thumbnails')), + PREVIEWS_DIR: buildPath(config.get('storage.previews')), + TORRENTS_DIR: buildPath(config.get('storage.torrents')), + CACHE_DIR: buildPath(config.get('storage.cache')) }, WEBSERVER: { SCHEME: config.get('webserver.https') === true ? 'https' : 'http', -- cgit v1.2.3