From 9585f2abeaa3290079366d906235c331dd8a4586 Mon Sep 17 00:00:00 2001 From: Alexis Tyler Date: Fri, 22 Jan 2021 13:47:41 +1030 Subject: [PATCH] refactor: split myservers config into own cfg --- .env.test | 1 + README.md | 2 +- app/core/api-manager.ts | 8 ++++---- app/core/paths.ts | 2 ++ ava.config.cjs | 1 + dev/Unraid.net/myservers.cfg | 11 +++++++++++ dev/dynamix/dynamix.cfg | 18 +----------------- 7 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 dev/Unraid.net/myservers.cfg diff --git a/.env.test b/.env.test index 1abba9df1..2eba605af 100644 --- a/.env.test +++ b/.env.test @@ -3,5 +3,6 @@ PATHS_STATES=$(pwd)/../core/test/fixtures/states PATHS_PLUGINS=$(pwd)/../core/test/fixtures/plugins PATHS_UNRAID_VERSION=$(pwd)/../core/test/fixtures/etc/unraid-version PATHS_DYNAMIX_CONFIG=$(pwd)/../core/test/fixtures/boot/config/plugins/dynamix/dynamix.cfg +PATHS_MY_SERVERS_CONFIG=$(pwd)/../core/test/fixtures/boot/config/plugins/Unraid.net/myservers.cfg NCHAN=false PORT=5000 \ No newline at end of file diff --git a/README.md b/README.md index 7b99b0b9a..011170cf7 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Debug logs can be enabled via stdout while running with `start-debug`. ## Playground The playground can be access via `http://tower.local/graphql` while `PLAYGROUND=true` and `INTROSPECTION=true`. These values can be set in the `ecosystem.config.js` file in `/usr/local/bin/node/unraid-api`. -To get your API key open a terminal on your server and run `cat /boot/config/plugins/dynamix/dynamix.cfg | grep apikey= | cut -d '"' -f2`. Add that api key in the "HTTP headers" panel of the playground. +To get your API key open a terminal on your server and run `cat /boot/config/plugins/Unraid.net/myservers.cfg | grep apikey= | cut -d '"' -f2`. Add that api key in the "HTTP headers" panel of the playground. ```json { diff --git a/app/core/api-manager.ts b/app/core/api-manager.ts index f8933c2ed..60228ba4b 100644 --- a/app/core/api-manager.ts +++ b/app/core/api-manager.ts @@ -3,6 +3,7 @@ * Written by: Alexis Tyler */ +import path from 'path'; import chokidar from 'chokidar'; import { EventEmitter } from 'events'; import toMillisecond from 'ms'; @@ -116,12 +117,11 @@ export class ApiManager extends EventEmitter { // Create singleton ApiManager.instance = this; - // Watch for changes to the dynamix.cfg file + // Watch for changes to the myservers.cfg file // @todo Move API keys to their own file - const basePath = paths.get('dynamix-base')!; - const configPath = paths.get('dynamix-config')!; + const configPath = paths.get('myservers-config')!; if (options.watch) { - chokidar.watch(basePath, { + chokidar.watch(path.basename(configPath), { ignoreInitial: true }).on('all', async (_eventName, filePath) => { if (filePath === configPath) { diff --git a/app/core/paths.ts b/app/core/paths.ts index 2e13d866c..6ab300a49 100644 --- a/app/core/paths.ts +++ b/app/core/paths.ts @@ -16,6 +16,7 @@ export interface Paths { 'emhttpd-socket': string; 'dynamix-base': string; 'dynamix-config': string; + 'myservers-config': string; 'nginx-origin': string; 'machine-id': string; } @@ -46,6 +47,7 @@ export const defaultPaths = new Map([ ['states', '/usr/local/emhttp/state/'], ['dynamix-base', '/boot/config/plugins/dynamix/'], ['dynamix-config', '/boot/config/plugins/dynamix/dynamix.cfg'], + ['myservers-config', '/boot/config/plugins/Unraid.net/myservers.cfg'], ['nginx-origin', '/var/run/nginx.origin'], ['machine-id', '/etc/machine-id'] ]); diff --git a/ava.config.cjs b/ava.config.cjs index 4efe05fc1..1335311bb 100644 --- a/ava.config.cjs +++ b/ava.config.cjs @@ -8,6 +8,7 @@ const config = { PATHS_STATES: path.resolve(__dirname, './dev/states'), PATHS_DYNAMIX_BASE: path.resolve(__dirname, './dev/dynamix'), PATHS_DYNAMIX_CONFIG: path.resolve(__dirname, './dev/dynamix/dynamix.cfg'), + PATHS_MY_SERVERS_CONFIG: path.resolve(__dirname, './dev/Unraid.net/myservers.cfg'), API_KEY: 'TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST' }, files: [ diff --git a/dev/Unraid.net/myservers.cfg b/dev/Unraid.net/myservers.cfg new file mode 100644 index 000000000..c4564ae1e --- /dev/null +++ b/dev/Unraid.net/myservers.cfg @@ -0,0 +1,11 @@ +[remote] +apikey="_______________________BIG_API_KEY_HERE_________________________" +email="test@example.com" +wanaccess="no" +wanport="0" +username="zspearmint" +avatar="https://via.placeholder.com/200" +regWizTime="1611175408732_0951-1653-3509-FBA155FA23C0" +event="REG_WIZARD" +keyfile="_____________________EVEN_BIGGER_KEY_HERE_________________________" +license="" \ No newline at end of file diff --git a/dev/dynamix/dynamix.cfg b/dev/dynamix/dynamix.cfg index 305745cb9..8fe95fabe 100644 --- a/dev/dynamix/dynamix.cfg +++ b/dev/dynamix/dynamix.cfg @@ -18,20 +18,6 @@ critical="90" hot="45" max="55" sysinfo="/Tools/SystemProfiler" -[remote] -apikey="TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST_TEST" -wanaccess="yes" -wanport="0" -sshprivkey="-----BEGIN OPENSSH PRIVATE KEY----- -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ------END OPENSSH PRIVATE KEY----- -" -sshpubkey="ssh-ed25519 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -" [notify] entity="1" normal="1" @@ -46,6 +32,4 @@ date="d-m-Y" time="H:i" position="top-right" path="/tmp/notifications" -system="*/1 * * * *" -[wizard] -hideWizard="1" +system="*/1 * * * *" \ No newline at end of file