#252 reorganise .env

nuxt.config.js

@@ -1,3 +1,5 @@
+require('./src/dotenv')();
+
 import { loadSuml } from './server/loader';
 import fs from 'fs';
 import {buildDict, buildList, buildLocaleList} from "./src/helpers";

server/calendar.js

@@ -1,4 +1,5 @@
-require('dotenv').config({ path:__dirname + '/../.env' });
+require('../src/dotenv')();
+
 const Pageres = require('pageres');
 const fs  = require('fs');
 const Suml = require('suml');

server/cards.js

@@ -1,4 +1,5 @@
-require('dotenv').config({ path:__dirname + '/../.env' });
+require('../src/dotenv')();
+
 const Pageres = require('pageres');
 const isHighLoadTime = require('./overload');
 const dbConnection = require('./db');

server/cleanupImages.js

@@ -1,5 +1,6 @@
+require('../src/dotenv')();
+
 const dbConnection = require('./db');
-require('dotenv').config({ path:__dirname + '/../.env' });
 const awsConfig = require('./aws');
 const S3 = require('aws-sdk/clients/s3');
 

server/notify.js

@@ -1,5 +1,6 @@
+require('../src/dotenv')();
+
 const dbConnection = require('./db');
-require('dotenv').config({ path:__dirname + '/../.env' });
 const mailer = require('../src/mailer');
 
 // TODO duplication...

server/stats.js

@@ -1,5 +1,6 @@
+require('../src/dotenv')();
+
 const dbConnection = require('./db');
-require('dotenv').config({ path:__dirname + '/../.env' });
 const {calculateStats, statsFile} = require('../src/stats');
 const locales = require('../src/locales');
 const fs = require('fs');

src/dotenv.js

@@ -0,0 +1,8 @@
+const dotenv = require('dotenv');
+
+module.exports = () => {
+    dotenv.config({ path:__dirname + '/../.env' });
+    if (process.env.__INCLUDE) {
+        dotenv.config({ path:__dirname + '/../' + process.env.__INCLUDE });
+    }
+}