Browse Source

Поправки путей к директориям

Book Pauk 6 years ago
parent
commit
0ea1e3f837
2 changed files with 12 additions and 9 deletions
  1. 7 5
      server/config/base.js
  2. 5 4
      server/config/production.js

+ 7 - 5
server/config/base.js

@@ -1,13 +1,15 @@
 const path = require('path');
 const pckg = require('../../package.json');
-const execPath = path.resolve(__dirname, '..');
+
+const execDir = path.resolve(__dirname, '..');
+const dataDir = `${execDir}/data`;
 
 module.exports = {
     branch: 'base',
-    tempDir: execPath + '/tmp',
-    logDir: execPath + '/log',
-    dataDir: execPath + '/data',
-    publicDir: execPath + '/public',
+    dataDir: dataDir,
+    tempDir: `${dataDir}/tmp`,
+    logDir: `${dataDir}/log`,
+    publicDir: `${execDir}/public`,
     dbFileName: 'db.sqlite',
     loggingEnabled: true,
 

+ 5 - 4
server/config/production.js

@@ -2,12 +2,13 @@ const path = require('path');
 const base = require('./base');
 
 const execPath = path.dirname(process.execPath);
+const dataDir = `${execDir}/data`;
 
 module.exports = Object.assign({}, base, {
         branch: 'production',
-        tempDir: execPath + '/tmp',
-        logDir: execPath + '/log',
-        dataDir: execPath + '/data',
-        publicDir: execPath + '/public',
+        dataDir: dataDir,
+        tempDir: `${dataDir}/tmp`,
+        logDir: `${dataDir}/log`,
+        publicDir: `${execDir}/public`,
     }
 );