Update from RunOnFlux/flux@c125e83

RunOnFlux · Oct 19, 2024 · 8b56ab9 · 8b56ab9
1 parent 2403232
commit 8b56ab9
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 59 deletions.
diff --git a/services/benchmarkService.js b/services/benchmarkService.js
@@ -17,8 +17,7 @@ let response = messageHelper.createErrorMessage();
 let benchdClient = null;
 
 async function buildBenchdClient() {
-  const homeDirPath = path.join(__dirname, '../../../../');
-  const fluxbenchdPath = path.join(homeDirPath, '.fluxbenchmark');
+  const fluxbenchdPath = '/dat/usr/lib/fluxbenchd';
 
   const exists = await fs.stat(fluxbenchdPath).catch(() => false);
 

diff --git a/services/syncthingService.js b/services/syncthingService.js
@@ -51,38 +51,39 @@ const stc = new FluxController();
  * @returns {Promise<(string | null)>} config gile (XML).
  */
 async function getConfigFile() {
-  const homedir = os.homedir();
-  const configDir = path.join(homedir, '.config');
-  const syncthingDir = path.join(configDir, 'syncthing');
-  const configFile = path.join(syncthingDir, 'config.xml');
+  // const homedir = os.homedir();
+  // const configDir = path.join(homedir, '.config');
+  // const syncthingDir = path.join(configDir, 'syncthing');
+  // const configFile = path.join(syncthingDir, 'config.xml');
+  const configFile = '/dat/usr/lib/syncthing/config.xml';
 
-  const user = os.userInfo().username;
-  const owner = `${user}:${user}`;
+  // const user = os.userInfo().username;
+  // const owner = `${user}:${user}`;
 
   // As syncthing is running as root, we need to change owenership to running user
-  const { error: chownConfigDirError } = await serviceHelper.runCommand('chown', {
-    runAsRoot: true,
-    logError: false,
-    params: [owner, configDir],
-  });
+  // const { error: chownConfigDirError } = await serviceHelper.runCommand('chown', {
+  //   runAsRoot: true,
+  //   logError: false,
+  //   params: [owner, configDir],
+  // });
 
-  if (chownConfigDirError) return null;
+  // if (chownConfigDirError) return null;
 
-  const { error: chownSyncthingError } = await serviceHelper.runCommand('chown', {
-    runAsRoot: true,
-    logError: false,
-    params: [owner, syncthingDir],
-  });
+  // const { error: chownSyncthingError } = await serviceHelper.runCommand('chown', {
+  //   runAsRoot: true,
+  //   logError: false,
+  //   params: [owner, syncthingDir],
+  // });
 
-  if (chownSyncthingError) return null;
+  // if (chownSyncthingError) return null;
 
-  const { error: chmodError } = await serviceHelper.runCommand('chmod', {
-    runAsRoot: true,
-    logError: false,
-    params: ['644', configFile],
-  });
+  // const { error: chmodError } = await serviceHelper.runCommand('chmod', {
+  //   runAsRoot: true,
+  //   logError: false,
+  //   params: ['644', configFile],
+  // });
 
-  if (chmodError) return null;
+  // if (chmodError) return null;
 
   let result = null;
   // this should never reject as chown would error first but just in case
@@ -2494,10 +2495,11 @@ async function runSyncthingSentinel() {
       log.error('Unable to get syncthing deviceId. Reconfiguring syncthing.');
       await stopSyncthing();
       await installSyncthingIdempotently();
-      await configureDirectories();
+      // await configureDirectories();
 
-      const homedir = os.homedir();
-      const syncthingHome = path.join(homedir, '.config/syncthing');
+      // const homedir = os.homedir();
+      // const syncthingHome = path.join(homedir, '.config/syncthing');
+      const syncthingHome = '/dat/usr/lib/syncthing';
       const logFile = path.join(syncthingHome, 'syncthing.log');
 
       if (stc.aborted) return 0;
@@ -2515,32 +2517,26 @@ async function runSyncthingSentinel() {
       // adding old spawn with shell in the interim.
 
       childProcess.spawn(
-        `sudo nohup syncthing --logfile ${logFile} --logflags=3 --log-max-old-files=2 --log-max-size=26214400 --allow-newer-config --no-browser --home ${syncthingHome} >/dev/null 2>&1 </dev/null &`,
-        { shell: true },
+        'nohup',
+        [
+          'syncthing',
+          '--logfile',
+          logFile,
+          '--logflags=3',
+          '--log-max-old-files=2',
+          '--log-max-size=26214400',
+          '--allow-newer-config',
+          '--no-browser',
+          '--home',
+          syncthingHome,
+        ],
+        {
+          detached: true,
+          stdio: 'ignore',
+          env: { HOME: syncthingHome },
+        },
       ).unref();
 
-      // childProcess.spawn(
-      //   'sudo',
-      //   [
-      //     'nohup',
-      //     'syncthing',
-      //     '--logfile',
-      //     logFile,
-      //     '--logflags=3',
-      //     '--log-max-old-files=2',
-      //     '--log-max-size=26214400',
-      //     '--allow-newer-config',
-      //     '--no-browser',
-      //     '--home',
-      //     syncthingHome,
-      //   ],
-      //   {
-      //     detached: true,
-      //     stdio: 'ignore',
-      //     // uid: 0,
-      //   },
-      // ).unref();
-
       // let syncthing set itself up
       await stc.sleep(5 * 1000);
     }

diff --git a/services/systemService.js b/services/systemService.js
@@ -521,7 +521,11 @@ async function mongoDBConfig() {
   log.info('MongoDB file config verification...');
   try {
     const hashCurrent = hash(await fs.readFile('/etc/mongod.conf'));
-    const vailidHashes = ['4646c649230b8125c7894d618313039f20d1901b', '1b20cbacf63c4400d0bf90188615db78b9a7602e'];
+    const vailidHashes = [
+      'cdf6ed6515ac061f5e6b6084af91767f42cd79d7',
+      '4646c649230b8125c7894d618313039f20d1901b',
+      '1b20cbacf63c4400d0bf90188615db78b9a7602e',
+    ];
     if (vailidHashes.indexOf(hashCurrent) !== -1) {
       log.info('MongoDB config verification passed.');
       return;

diff --git a/services/utils/daemonConfig.js b/services/utils/daemonConfig.js
@@ -5,8 +5,8 @@ const os = require('node:os');
 class DaemonConfig {
   static daemonConfigPaths = {
     linux: {
-      zelPath: '.zelcash/zelcash.conf',
-      fluxPath: '.flux/flux.conf',
+      zelPath: 'flux.conf',
+      fluxPath: 'flux.conf',
     },
     darwin: {
       zelPath: 'Zelcash/zelcash.conf',
@@ -24,16 +24,14 @@ class DaemonConfig {
 
   platform = process.platform;
 
-  homedir = os.homedir();
-
   raw = '';
 
   configElements = {};
 
   constructor() {
     switch (this.platform) {
       case 'linux':
-        this.baseDir = os.homedir();
+        this.baseDir = '/dat/var/lib/fluxd';
         break;
       case 'darwin':
         this.baseDir = path.join(os.homedir(), 'Library/Application Support');