Merge pull request #211 from stefanhayden/stefanhayden/config_data_dir

let the data directory be set by enviorment vars

Author: ckolderup

src/activity-pub-db.js

@@ -10,9 +10,9 @@ import fs from 'fs';
 import sqlite3 from 'sqlite3';
 import { open } from 'sqlite';
 import crypto from 'crypto';
-import { account, domain, actorInfo } from './util.js';
+import { account, domain, actorInfo, dataDir } from './util.js';
 
-const dbFile = './.data/activitypub.db';
+const dbFile = `${dataDir}/activitypub.db`;
 let db;
 
 function actorJson(pubkey) {

src/bookmarks-db.js

@@ -11,12 +11,12 @@ import { open } from 'sqlite';
 // unclear why eslint can't resolve this package
 // eslint-disable-next-line import/no-unresolved, node/no-missing-import
 import { stripHtml } from 'string-strip-html';
-import { timeSince, account, domain } from './util.js';
+import { timeSince, account, domain, dataDir } from './util.js';
 
 const ACCOUNT_MENTION_REGEX = new RegExp(`^@${account}@${domain} `);
 
 // Initialize the database
-const dbFile = './.data/bookmarks.db';
+const dbFile = `${dataDir}/bookmarks.db`;
 const exists = fs.existsSync(dbFile);
 let db;
 

src/routes/admin.js

@@ -1,12 +1,10 @@
 import express from 'express';
 // eslint-disable-next-line import/no-unresolved, node/no-missing-import
 import { stringify as csvStringify } from 'csv-stringify/sync'; // https://github.com/adaltas/node-csv/issues/323
-import { domain, actorInfo, parseJSON } from '../util.js';
+import { domain, actorInfo, parseJSON, dataDir } from '../util.js';
 import { isAuthenticated } from '../session-auth.js';
 import { lookupActorInfo, createFollowMessage, createUnfollowMessage, signAndSend, getInboxFromActorProfile } from '../activitypub.js';
 
-const DATA_PATH = '/app/.data';
-
 const ADMIN_LINKS = [
   { href: '/admin', label: 'Bookmarklet' },
   { href: '/admin/bookmarks', label: 'Import bookmarks' },
@@ -98,7 +96,7 @@ router.get('/data', isAuthenticated, async (req, res) => {
 });
 
 router.get('/bookmarks.db', isAuthenticated, async (req, res) => {
-  const filePath = `${DATA_PATH}/bookmarks.db`;
+  const filePath = `${dataDir}/bookmarks.db`;
 
   res.setHeader('Content-Type', 'application/vnd.sqlite3');
   res.setHeader('Content-Disposition', 'attachment; filename="bookmarks.db"');
@@ -118,7 +116,7 @@ router.get('/bookmarks.csv', isAuthenticated, async (req, res) => {
 });
 
 router.get('/activitypub.db', isAuthenticated, async (req, res) => {
-  const filePath = `${DATA_PATH}/activitypub.db`;
+  const filePath = `${dataDir}/activitypub.db`;
 
   res.setHeader('Content-Type', 'application/vnd.sqlite3');
   res.setHeader('Content-Disposition', 'attachment; filename="activitypub.db"');

src/session-auth.js

@@ -1,13 +1,14 @@
 import session from 'express-session';
 import connectSqlite from 'connect-sqlite3';
+import { dataDir } from './util.js';
 
 const SQLiteStore = connectSqlite(session);
 
 export default () =>
   session({
     store: new SQLiteStore({
       db: 'sessions.db',
-      dir: '.data/',
+      dir: `${dataDir}/`,
     }),
     secret: process.env.SESSION_SECRET,
     resave: false,

src/util.js

@@ -5,6 +5,8 @@ import * as dotenv from 'dotenv';
 
 dotenv.config();
 
+export const dataDir = process.env.DATA_DIR || '.data';
+
 export const data = {
   errorMessage: 'Whoops! Error connecting to the database–please try again!',
   setupMessage: "🚧 Whoops! Looks like the database isn't setup yet! 🚧",