diff --git a/server/config/default-test.json5 b/server/config/default-test.json5 index f496e09..0b16943 100644 --- a/server/config/default-test.json5 +++ b/server/config/default-test.json5 @@ -1,6 +1,7 @@ { logDir: '', serviceName: { + system: 'deighton-ar-test', server: 'dar-test-server', api: 'dar-test-api', email: 'dar-test-email', diff --git a/server/config/default.json5 b/server/config/default.json5 index 7388004..88eeb72 100644 --- a/server/config/default.json5 +++ b/server/config/default.json5 @@ -1,6 +1,7 @@ { logDir: '', serviceName: { + system: 'deighton-ar', server: 'dar-server', api: 'dar-api', email: 'dar-email', diff --git a/server/package-lock.json b/server/package-lock.json index 4aa34b0..8a5e3ab 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -5987,6 +5987,11 @@ "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", "dev": true }, + "sleep-promise": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/sleep-promise/-/sleep-promise-6.0.0.tgz", + "integrity": "sha1-qAtMPCbtVTxzydtyNLwDBPfULUo=" + }, "sliced": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", diff --git a/server/package.json b/server/package.json index 5e1abca..182b277 100644 --- a/server/package.json +++ b/server/package.json @@ -7,7 +7,7 @@ "start": "babel-node src/server.js", "start:prod": "NODE_ENV=production node dist/server.js", "build": "rm -rf dist && babel src -d dist -s", - "deploy": "rsync -vr -e ssh --exclude-from .rsync-exclude * $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST:deighton-ar-server/ && ssh $SNAP_DEPLOY_USER@$SNAP_DEPLOYHOST 'cd deighton-ar-server && npm install & sudo ./ops restart & sudo ./ops --test restart'", + "deploy": "rsync -vr -e ssh --exclude-from .rsync-exclude * $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST:deighton-ar-server/ && ssh $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST 'cd deighton-ar-server && npm install & sudo ./ops restart & sudo ./ops --test restart'", "test": "jest", "actor:api": "monzilla 'src/api/**/*.js:src/database/**/*.js' -- babel-node src/api/index.js", "actor:api:debug": "babel-node --inspect-brk src/api/index.js", @@ -48,6 +48,7 @@ "redis": "^2.7.1", "redis-rstream": "^0.1.3", "regexp-pattern": "^1.0.4", + "sleep-promise": "^6.0.0", "socket.io": "^2.0.3", "tmp-promise": "^1.0.4", "urlsafe-base64": "^1.0.0",