Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
chore: update variable & file names for consistency
johaven5ed9ac0413c5
diff --git a/.gitignore b/.gitignoreindex 7525d2e6..ce4e7ae1 100755--- a/.gitignore+++ b/.gitignore@@ -1,10 +1,11 @@node_modules-run+logs.rundist.idea.DS_Storebackend/coverage+backend/logsenvironment/environment.yamlfrontend/staticfrontend/.angular/diff --git a/Dockerfile b/Dockerfileindex 1a6c9064..b4d92e23 100644--- a/Dockerfile+++ b/Dockerfile@@ -19,7 +19,7 @@ COPY --from=build --chown=syncin:syncin build/dist/ .COPY --from=build --chown=syncin:syncin build/node_modules ./node_modulesCOPY --from=build --chown=syncin:syncin build/backend/migrations ./migrationsCOPY --from=build --chown=syncin:syncin build/environment/environment.dist.yaml ./environment/environment.dist.yaml-COPY --from=build --chown=syncin:syncin build/scripts/sync-in-server.sh ./sync-in-server.sh+COPY --from=build --chown=syncin:syncin build/scripts/docker-sync-in-server.sh ./sync-in-server.shENV NODE_ENV=productionENV NPM_CONFIG_UPDATE_NOTIFIER=falseEXPOSE 3000diff --git a/backend/package.json b/backend/package.jsonindex 4ac0a7b1..33c26b7f 100755--- a/backend/package.json+++ b/backend/package.json@@ -3,7 +3,6 @@"productName": "Sync-in","version": "1.0.0","private": true,- "description": "The open source file sync and share solution","license": "AGPL-3.0-or-later","author": {"name": "Johan Legrand",diff --git a/backend/src/configuration/config.constants.ts b/backend/src/configuration/config.constants.tsindex 3b728b88..d423def7 100644--- a/backend/src/configuration/config.constants.ts+++ b/backend/src/configuration/config.constants.ts@@ -7,9 +7,10 @@import path from 'node:path'import process from 'node:process'-export const IS_PROD_ENV: boolean = process.env['NODE_ENV'] === 'production'+export const IS_DEV_ENV: boolean = process.env['NODE_ENV'] === 'development'export const IS_TEST_ENV: boolean = process.env['NODE_ENV'] === 'test'-export const ENVIRONMENT_FILE = 'environment/environment.yaml'+export const ENVIRONMENT_FILE_NAME = 'environment.yaml'+export const ENVIRONMENT_PATH = `environment/${ENVIRONMENT_FILE_NAME}`export const STATIC_PATH = path.resolve(path.join(__dirname, IS_TEST_ENV ? '../../../dist/static' : '../../static'))export const STATIC_ASSETS_PATH = path.join(STATIC_PATH, 'assets')-export const APP_RUN_PATH = path.join(__dirname, '../../run')+export const APP_LOGS_PATH = path.join(__dirname, '../../logs')diff --git a/backend/src/configuration/config.loader.ts b/backend/src/configuration/config.loader.tsindex 10b80fc3..d71fe28a 100644--- a/backend/src/configuration/config.loader.ts+++ b/backend/src/configuration/config.loader.ts@@ -7,16 +7,16 @@import * as yaml from 'js-yaml'import fs from 'node:fs'import path from 'node:path'-import { APP_RUN_PATH, ENVIRONMENT_FILE } from './config.constants'+import { APP_LOGS_PATH, ENVIRONMENT_FILE_NAME, ENVIRONMENT_PATH } from './config.constants'export function configLoader(): any {- if (!fs.existsSync(APP_RUN_PATH)) {- fs.mkdirSync(APP_RUN_PATH, { recursive: true })+ if (!fs.existsSync(APP_LOGS_PATH)) {+ fs.mkdirSync(APP_LOGS_PATH, { recursive: true })}- for (const envPath of [path.join(__dirname, `../../../${ENVIRONMENT_FILE}`), `./${ENVIRONMENT_FILE}`]) {+ for (const envPath of [path.join(__dirname, `../../../${ENVIRONMENT_PATH}`), `./${ENVIRONMENT_PATH}`, ENVIRONMENT_FILE_NAME]) {if (fs.existsSync(envPath) && fs.lstatSync(envPath).isFile()) {return yaml.load(fs.readFileSync(envPath, 'utf8'))}}- throw new Error(`${ENVIRONMENT_FILE} not found`)+ throw new Error(`${ENVIRONMENT_FILE_NAME} not found`)}diff --git a/backend/src/infrastructure/database/constants.ts b/backend/src/infrastructure/database/constants.tsindex 8557ea5d..7663ca2b 100644--- a/backend/src/infrastructure/database/constants.ts+++ b/backend/src/infrastructure/database/constants.ts@@ -5,9 +5,9 @@*/import path from 'node:path'-import { IS_PROD_ENV } from '../../configuration/config.constants'+import { IS_DEV_ENV } from '../../configuration/config.constants'export const DB_CHARSET = 'utf8mb4'export const DB_TOKEN_PROVIDER = 'DB'-export const SCHEMA_PATH = path.join(__dirname, `./schema${IS_PROD_ENV ? '.js' : '.ts'}`)+export const SCHEMA_PATH = path.join(__dirname, `./schema${IS_DEV_ENV ? '.ts' : '.js'}`)export const MIGRATIONS_PATH = './migrations'diff --git a/environment/environment.dist.yaml b/environment/environment.dist.yamlindex 00f448b1..1163cd31 100755--- a/environment/environment.dist.yaml+++ b/environment/environment.dist.yaml@@ -14,7 +14,7 @@ logger:# stdout : if false logs are written to the run directory (default: true)stdout: truemysql:- url: mysql://user:password@localhost:3306/database+ url: mysql://user:MySQLRootPassword@localhost:3306/databaselogQueries: falsecache:# adapter: mysql (default) | redis (requires optional dependency: redis)diff --git a/frontend/package.json b/frontend/package.jsonindex ebee2d04..859edd1e 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -1,7 +1,6 @@{"productName": "Sync-in","name": "@sync-in-server/frontend",- "description": "The open source file sync and share solution","author": {"name": "Johan Legrand","email": "[email protected]"diff --git a/scripts/sync-in-server.sh b/scripts/docker-sync-in-server.shsimilarity index 100%rename from scripts/sync-in-server.shrename to scripts/docker-sync-in-server.sh