diff --git a/README.md b/README.md index 6c09694..5c49d4f 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,6 @@ API_KEY=mykey syncthing-hooks Don't forget to substitute `mykey` with your syncthing API key, which can be found in the settings in the GUI. -If Syncthing runs on another host or listens to a non-default port, you can specify an URL by using `ST_URL`. -Note that this URL has to include the protocol, hostname, port and path, e.g.: - -``` -ST_URL=http://:8384/rest/events -``` - It won't install itself as a daemon by default, however. In order to run it as a service, it is recommended to install [pm2](https://pm2.keymetrics.io/): ```sh @@ -51,9 +44,7 @@ pm2 logs ## Hooks -Create a folder in your home directory called `.syncthing-hooks`. -A different directory can be set using `ST_HOOK_ROOT`. -Each hook is a file with the following naming scheme: +Create a folder in your home directory called `.syncthing-hooks`. Each hook is a file with the following naming scheme: `folder-name-delay` @@ -61,4 +52,4 @@ The folder name is the 11 character unique string found in the syncthing GUI. Th An example: a script at the location `~/.syncthing-hooks/night-owlzz-5m` will be executed five minutes after the most recent event in the folder with the identifier `night-owlzz`. -Don't forget to `chmod +x` the script. +Make sure your folder identifier is exactly 11 characters long and does not have an extension. Also, don't forget to `chmod +x` the script. diff --git a/api.js b/api.js index 5219d25..7caf844 100644 --- a/api.js +++ b/api.js @@ -1,10 +1,9 @@ const got = require('got'); -const { getEnvVar } = require('./env.js'); const fetchEvents = () => - got(getEnvVar('ST_URL','http://localhost:8384/rest/events'), { + got('http://localhost:8384/rest/events', { headers: { - 'X-API-Key': getEnvVar('API_KEY','invalid') + 'X-API-Key': process.env.API_KEY, }, }).json(); diff --git a/env.js b/env.js deleted file mode 100644 index 8999dd4..0000000 --- a/env.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - getEnvVar: function (varname, defaultvalue){ - var result = process.env[varname]; - if(result!=undefined) - return result; - else - return defaultvalue; - } -}; diff --git a/hooks.js b/hooks.js index 19c0531..512d6c2 100644 --- a/hooks.js +++ b/hooks.js @@ -3,9 +3,8 @@ const ms = require('ms'); const os = require('os'); const path = require('path'); const { spawn } = require('child_process'); -const { getEnvVar } = require('./env.js'); -const getHooksRoot = () => getEnvVar('ST_HOOK_ROOT', path.join(os.homedir(), '/.syncthing-hooks')) +const getHooksRoot = () => path.join(os.homedir(), '/.syncthing-hooks'); const readHooksRoot = async root => { try { @@ -21,7 +20,7 @@ const parseHooks = (root, hooks) => hooks .map(x => ({ path: path.join(root, x), - match: x.match(/(?.*)-(?