From 02ff4aaaefd0d8b8fcb0ae9a177a8884a1cfbf9a Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 15 Aug 2021 12:18:59 -0700 Subject: [PATCH] Misc fixes --- backend/util.js | 1 + packer/provision-web.bash | 2 +- supervisor/src/main.go | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/util.js b/backend/util.js index a55e225..4e5d7b4 100644 --- a/backend/util.js +++ b/backend/util.js @@ -2,6 +2,7 @@ import { spawn } from "child_process"; import os from "os"; import process from "process"; +import * as Sentry from "@sentry/node"; import { v4 as getUUIDOrig } from "uuid"; let sentryEnabled = false; diff --git a/packer/provision-web.bash b/packer/provision-web.bash index 19ead1b..77232f2 100644 --- a/packer/provision-web.bash +++ b/packer/provision-web.bash @@ -62,7 +62,7 @@ sudo sed -Ei "s/\\\$AWS_REGION/${AWS_REGION}/" /etc/systemd/system/riju.service sudo sed -Ei "s/\\\$FATHOM_SITE_ID/${FATHOM_SITE_ID:-}/" /etc/systemd/system/riju.service sudo sed -Ei "s/\\\$S3_BUCKET/${S3_BUCKET}/" /etc/systemd/system/riju.service sudo sed -Ei "s/\\\$SENTRY_DSN/${SENTRY_DSN:-}/" /etc/systemd/system/riju.service -sudo sed -Ei "s/\\\$SUPERVISOR_ACCESS_TOKEN/${SUPERVISOR_ACCESS_TOKEN}/" /etc/systemd/system/riju.service +sudo sed -Ei "s|\\\$SUPERVISOR_ACCESS_TOKEN|${SUPERVISOR_ACCESS_TOKEN}|" /etc/systemd/system/riju.service sudo passwd -l root sudo useradd admin -g admin -G sudo -s /usr/bin/bash -p "$(echo "${ADMIN_PASSWORD}" | mkpasswd -s)" -m diff --git a/supervisor/src/main.go b/supervisor/src/main.go index 52ff307..7686ea8 100644 --- a/supervisor/src/main.go +++ b/supervisor/src/main.go @@ -322,7 +322,6 @@ func (sv *supervisor) reload() error { deployCfgHash := fmt.Sprintf("%x", h.Sum(nil)) if deployCfgHash == sv.deployConfigHash { sv.status(fmt.Sprintf("config hash remains at %s", deployCfgHash)) - return nil } else { sv.status(fmt.Sprintf( "config hash updated %s => %s",