diff --git a/web/lib/ssb-client.js b/web/lib/ssb-client.js index 65cebbb..fc4599c 100644 --- a/web/lib/ssb-client.js +++ b/web/lib/ssb-client.js @@ -4,14 +4,11 @@ const ssbConfig = require("./ssb-config"); const queries = require("./queries"); const debug = require("debug")("express"); const metrics = require("./metrics"); +const { ssbFolder } = require("./utils"); let ssbClient; -let homeFolder = - process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE; -let ssbSecret = ssbKeys.loadOrCreateSync( - `${homeFolder}/.${process.env.CONFIG_FOLDER || "feedless"}/secret` -); +let ssbSecret = ssbKeys.loadOrCreateSync(`${ssbFolder()}/secret`); let syncing = false; const connectClient = (ssbSecret) => { diff --git a/web/lib/ssb-config.js b/web/lib/ssb-config.js index f44936f..356b723 100644 --- a/web/lib/ssb-config.js +++ b/web/lib/ssb-config.js @@ -1,6 +1,6 @@ const configInject = require("ssb-config/inject"); -module.exports = configInject(process.env.CONFIG_FOLDER || "feedless", { +module.exports = configInject(process.env.CONFIG_FOLDER || "ssb", { connections: { incoming: { net: [ diff --git a/web/package.json b/web/package.json index eeb1dbe..a1ec8f2 100644 --- a/web/package.json +++ b/web/package.json @@ -6,8 +6,6 @@ "scripts": { "start": "MODE=server SSB_PORT=8009 node index.js", "start:standalone": "electron .", - "start:user-2": "SSB_PORT=8010 PORT=3001 CONFIG_FOLDER=feedless-user2 electron .", - "start:user-3": "SSB_PORT=8011 PORT=3002 CONFIG_FOLDER=feedless-user3 electron .", "clear": "rm -rf ~/.feedless; rm -rf ~/.feedless-user2; rm -rf ~/.feedless-user3", "package:mac": "electron-packager . --platform=darwin --arch=x64 --out out/ --overwrite", "package:linux": "electron-packager . --platform=linux --arch=x64 --out out/ --overwrite"