Skip to content
Snippets Groups Projects
Commit cd280802 authored by James Long's avatar James Long
Browse files

Improve how data dirs are treated

parent b53a4e5b
Branches
No related tags found
No related merge requests found
......@@ -7,6 +7,9 @@ RUN mkdir /app
WORKDIR /app
ENV NODE_ENV=production
ADD . .
RUN yarn install --production
......
......@@ -6,6 +6,11 @@ let accountDb = null;
function getAccountDb() {
if (accountDb == null) {
if (!fs.existsSync(config.serverFiles)) {
console.log('MAKING SERVER DIR');
fs.mkdirSync(config.serverFiles);
}
let dbPath = join(config.serverFiles, 'account.sqlite');
let needsInit = !fs.existsSync(dbPath);
......
......@@ -19,7 +19,7 @@ const app = express();
app.use(errorMiddleware);
async function init() {
let fileDir = join(__dirname, process.env.ACTUAL_USER_FILES || config.userFiles);
let fileDir = join(process.env.ACTUAL_USER_FILES || config.userFiles);
console.log('Initializing Actual with user file dir:', fileDir);
......
const fs = require('fs');
const express = require('express');
const bodyParser = require('body-parser');
const cors = require('cors');
......@@ -31,6 +32,14 @@ app.get('/*', (req, res) => {
});
async function run() {
if (!fs.existsSync(config.serverFiles)) {
fs.mkdirSync(config.serverFiles);
}
if (!fs.existsSync(config.userFiles)) {
fs.mkdirSync(config.userFiles);
}
await accountApp.init();
await syncApp.init();
......
......@@ -4,7 +4,7 @@ try {
} catch (e) {
let fs = require('fs');
let { join } = require('path');
let root = fs.existsSync('/data') ? '/data' : './';
let root = fs.existsSync('/data') ? '/data' : __dirname;
config = {
mode: 'development',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment