diff --git a/redisinsight/api/config/default.ts b/redisinsight/api/config/default.ts index 5fc40aed34..e5501394ac 100644 --- a/redisinsight/api/config/default.ts +++ b/redisinsight/api/config/default.ts @@ -109,14 +109,14 @@ export default { }, tutorials: { updateUrl: process.env.RI_TUTORIALS_UPDATE_URL - || 'https://github.com/RedisInsight/Tutorials/releases/download/2.x.x', + || 'https://github.com/RedisInsight/Tutorials/releases/download/2.42', zip: process.env.RI_TUTORIALS_ZIP || dataZipFileName, buildInfo: process.env.RI_TUTORIALS_INFO || buildInfoFileName, devMode: !!process.env.RI_TUTORIALS_PATH, }, content: { updateUrl: process.env.RI_CONTENT_UPDATE_URL - || 'https://github.com/RedisInsight/Statics/releases/download/latest', + || 'https://github.com/RedisInsight/Statics/releases/download/2.42', zip: process.env.RI_CONTENT_ZIP || dataZipFileName, buildInfo: process.env.RI_CONTENT_INFO || buildInfoFileName, devMode: !!process.env.RI_CONTENT_PATH, diff --git a/redisinsight/api/config/production.ts b/redisinsight/api/config/production.ts index 688608947d..b79847ea02 100644 --- a/redisinsight/api/config/production.ts +++ b/redisinsight/api/config/production.ts @@ -14,6 +14,7 @@ export default { customPlugins: join(homedir, 'plugins'), customTutorials: join(homedir, 'custom-tutorials'), commands: join(homedir, 'commands'), + guides: process.env.RI_GUIDES_PATH || join(homedir, 'guides'), tutorials: process.env.RI_TUTORIALS_PATH || join(homedir, 'tutorials'), content: process.env.RI_CONTENT_PATH || join(homedir, 'content'), caCertificates: join(homedir, 'ca_certificates'), diff --git a/redisinsight/api/config/staging.ts b/redisinsight/api/config/staging.ts index efa3c0d5eb..36ad6eb350 100644 --- a/redisinsight/api/config/staging.ts +++ b/redisinsight/api/config/staging.ts @@ -14,6 +14,7 @@ export default { customPlugins: join(homedir, 'plugins'), customTutorials: join(homedir, 'custom-tutorials'), commands: join(homedir, 'commands'), + guides: process.env.RI_GUIDES_PATH || join(homedir, 'guides'), tutorials: process.env.RI_TUTORIALS_PATH || join(homedir, 'tutorials'), content: process.env.RI_CONTENT_PATH || join(homedir, 'content'), caCertificates: join(homedir, 'ca_certificates'), diff --git a/redisinsight/api/src/init-helper.ts b/redisinsight/api/src/init-helper.ts index be8c67f4e1..6f0b244c8e 100644 --- a/redisinsight/api/src/init-helper.ts +++ b/redisinsight/api/src/init-helper.ts @@ -38,3 +38,16 @@ export const migrateHomeFolder = async () => { // continue initialization even without migration } }; + +/** + * Remove old guides folder + */ +export const removeGuidesFolder = async () => { + try { + if (await fs.pathExists(PATH_CONFIG.guides)) { + await fs.rm(PATH_CONFIG.guides, { recursive: true, force: true }); + } + } catch (e) { + // continue initialization even without migration + } +}; diff --git a/redisinsight/api/src/main.ts b/redisinsight/api/src/main.ts index 0e30698c26..d34d2eef2b 100644 --- a/redisinsight/api/src/main.ts +++ b/redisinsight/api/src/main.ts @@ -7,7 +7,7 @@ import * as bodyParser from 'body-parser'; import { WinstonModule } from 'nest-winston'; import { GlobalExceptionFilter } from 'src/exceptions/global-exception.filter'; import { get, Config } from 'src/utils'; -import { migrateHomeFolder } from 'src/init-helper'; +import { migrateHomeFolder, removeGuidesFolder } from 'src/init-helper'; import { LogFileProvider } from 'src/modules/profiler/providers/log-file.provider'; import { WindowsAuthAdapter } from 'src/modules/auth/window-auth/adapters/window-auth.adapter'; import { AppModule } from './app.module'; @@ -24,6 +24,7 @@ interface IApp { export default async function bootstrap(apiPort?: number): Promise { await migrateHomeFolder(); + await removeGuidesFolder(); const { port, host } = serverConfig; const logger = WinstonModule.createLogger(LOGGER_CONFIG);