@geekbeer/minion 1.0.2 → 1.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/minion-cli.sh +2 -2
- package/package.json +1 -1
- package/server.js +3 -3
package/minion-cli.sh
CHANGED
|
@@ -282,7 +282,7 @@ SUPEOF
|
|
|
282
282
|
# Response contains credentials_json and config_yml (generated server-side)
|
|
283
283
|
echo " Fetching tunnel configuration from HQ..."
|
|
284
284
|
local TUNNEL_DATA
|
|
285
|
-
TUNNEL_DATA=$(curl -
|
|
285
|
+
TUNNEL_DATA=$(curl -sfL -H "Authorization: Bearer ${API_TOKEN}" \
|
|
286
286
|
"${HQ_URL}/api/minion/tunnel-credentials" 2>&1) || true
|
|
287
287
|
|
|
288
288
|
if [ -z "$TUNNEL_DATA" ] || ! echo "$TUNNEL_DATA" | jq -e '.tunnel_id' > /dev/null 2>&1; then
|
|
@@ -319,7 +319,7 @@ SUPEOF
|
|
|
319
319
|
echo ""
|
|
320
320
|
echo "Notifying HQ of setup completion..."
|
|
321
321
|
local NOTIFY_RESPONSE
|
|
322
|
-
NOTIFY_RESPONSE=$(curl -
|
|
322
|
+
NOTIFY_RESPONSE=$(curl -sfL -X POST "${HQ_URL}/api/minion/setup-complete" \
|
|
323
323
|
-H "Content-Type: application/json" \
|
|
324
324
|
-H "Authorization: Bearer ${API_TOKEN}" \
|
|
325
325
|
-d "{}" 2>&1) || true
|
package/package.json
CHANGED
package/server.js
CHANGED
|
@@ -53,12 +53,12 @@ function buildAllowedCommands() {
|
|
|
53
53
|
deferred: true,
|
|
54
54
|
}
|
|
55
55
|
commands['restart-display'] = {
|
|
56
|
-
description: 'Restart Xvfb and noVNC services',
|
|
57
|
-
command: `${SUDO}systemctl restart xvfb novnc`,
|
|
56
|
+
description: 'Restart Xvfb, Fluxbox, x11vnc and noVNC services',
|
|
57
|
+
command: `${SUDO}systemctl restart xvfb fluxbox x11vnc novnc`,
|
|
58
58
|
}
|
|
59
59
|
commands['status-services'] = {
|
|
60
60
|
description: 'Check status of all services',
|
|
61
|
-
command: 'systemctl status minion-agent xvfb novnc --no-pager',
|
|
61
|
+
command: 'systemctl status minion-agent xvfb fluxbox x11vnc novnc --no-pager',
|
|
62
62
|
}
|
|
63
63
|
} else if (PROC_MGR === 'supervisord') {
|
|
64
64
|
commands['restart-agent'] = {
|