diff --git a/Makefile b/Makefile index aad9d3e..819a0b4 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ else SHELL_PORTS := endif -SHELL_ENV := -e Z -e CI -e TEST_PATIENCE -e TEST_CONCURRENCY -e TEST_TIMEOUT_SECS -e FATHOM_SITE_ID +SHELL_ENV := -e Z -e CI -e TEST_PATIENCE -e TEST_CONCURRENCY -e TEST_TIMEOUT_SECS -e ANALYTICS_TAG ifeq ($(I),lang) LANG_TAG := lang-$(L) diff --git a/backend/server.js b/backend/server.js index 3045370..63305c3 100644 --- a/backend/server.js +++ b/backend/server.js @@ -15,7 +15,7 @@ const host = process.env.HOST || "localhost"; const port = parseInt(process.env.PORT || "") || 6119; const tlsPort = parseInt(process.env.TLS_PORT || "") || 6120; const useTLS = process.env.TLS ? true : false; -const fathomSiteId = process.env.FATHOM_SITE_ID || ""; +const analyticsTag = process.env.ANALYTICS_TAG || ""; const langs = await langsPromise; const app = express(); @@ -27,7 +27,7 @@ app.get("/", (_, res) => { if (Object.keys(langs).length > 0) { res.render(path.resolve("frontend/pages/index"), { langs, - fathomSiteId, + analyticsTag, }); } else { res @@ -61,7 +61,7 @@ app.get("/:lang", (req, res) => { } res.render(path.resolve("frontend/pages/app"), { config: langs[lang], - fathomSiteId, + analyticsTag, }); }); app.use("/css", express.static("frontend/styles")); diff --git a/doc/selfhosting.md b/doc/selfhosting.md index 60f62f2..35ef4ab 100644 --- a/doc/selfhosting.md +++ b/doc/selfhosting.md @@ -263,9 +263,9 @@ enable all the fun CloudFlare options you'd like. ## Set up analytics (optional) -Sign up for Fathom Analytics, enter your domain name, and get a site -ID. Set this as `FATHOM_SITE_ID` in your `.env` file, and build and -roll out a new web AMI. +Sign up for Fathom Analytics, enter your domain name, and get a tag +for embedding. Set this as `ANALYTICS_TAG` in your `.env` file (don't +forget the appropriate quoting), and build and roll out a new web AMI. ## Set up monitoring (optional) diff --git a/frontend/pages/app.ejs b/frontend/pages/app.ejs index b2db5a3..495d279 100644 --- a/frontend/pages/app.ejs +++ b/frontend/pages/app.ejs @@ -22,8 +22,8 @@ window.rijuConfig = <%- JSON.stringify(config) %>; - <% if (fathomSiteId) { %> - + <% if (analyticsTag) { %> + <%= analyticsTag %> <% } %> diff --git a/frontend/pages/index.ejs b/frontend/pages/index.ejs index 77c1830..fe25f16 100644 --- a/frontend/pages/index.ejs +++ b/frontend/pages/index.ejs @@ -30,8 +30,8 @@ <% } else { %> Riju is loading language configuration... <% } %> - <% if (fathomSiteId) { %> - + <% if (analyticsTag) { %> + <%= analyticsTag %> <% } %> diff --git a/packer/provision-web.bash b/packer/provision-web.bash index 62a4bb1..dac1f74 100644 --- a/packer/provision-web.bash +++ b/packer/provision-web.bash @@ -59,7 +59,7 @@ sudo sed -Ei 's|^#?PermitRootLogin .*|PermitRootLogin no|' /etc/ssh/sshd_config sudo sed -Ei 's|^#?PasswordAuthentication .*|PasswordAuthentication no|' /etc/ssh/sshd_config sudo sed -Ei 's|^#?PermitEmptyPasswords .*|PermitEmptyPasswords no|' /etc/ssh/sshd_config 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|\\\$ANALYTICS_TAG|${ANALYTICS_TAG:-}|" /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 diff --git a/packer/riju.service b/packer/riju.service index 2697900..6e11ccf 100644 --- a/packer/riju.service +++ b/packer/riju.service @@ -11,7 +11,7 @@ ExecStart=riju-supervisor Restart=always RestartSec=5 Environment=AWS_REGION=$AWS_REGION -Environment=FATHOM_SITE_ID=$FATHOM_SITE_ID +Environment=ANALYTICS_TAG=ANALYTICS_TAG Environment=S3_BUCKET=$S3_BUCKET Environment=SENTRY_DSN=$SENTRY_DSN Environment=SUPERVISOR_ACCESS_TOKEN=$SUPERVISOR_ACCESS_TOKEN diff --git a/packer/web.pkr.hcl b/packer/web.pkr.hcl index 4ed4b3f..c20557a 100644 --- a/packer/web.pkr.hcl +++ b/packer/web.pkr.hcl @@ -8,9 +8,9 @@ variable "aws_region" { default = "${env("AWS_REGION")}" } -variable "fathom_site_id" { +variable "analytics_tag" { type = string - default = "${env("FATHOM_SITE_ID")}" + default = "${env("ANALYTICS_TAG")}" } variable "grafana_api_key" { @@ -116,7 +116,7 @@ build { environment_vars = [ "ADMIN_PASSWORD=${var.admin_password}", "AWS_REGION=${var.aws_region}", - "FATHOM_SITE_ID=${var.fathom_site_id}", + "ANALYTICS_TAG=${var.analytics_tag}", "GRAFANA_API_KEY=${var.grafana_api_key}", "S3_BUCKET=${var.s3_bucket}", "SENTRY_DSN=${var.sentry_dsn}", diff --git a/supervisor/src/main.go b/supervisor/src/main.go index 54c829b..2600475 100644 --- a/supervisor/src/main.go +++ b/supervisor/src/main.go @@ -355,7 +355,7 @@ func (sv *supervisor) reload() error { "-v", "/var/cache/riju:/var/cache/riju", "-v", "/var/run/docker.sock:/var/run/docker.sock", "-p", fmt.Sprintf("127.0.0.1:%d:6119", port), - "-e", "FATHOM_SITE_ID", + "-e", "ANALYTICS_TAG", "-e", "RIJU_DEPLOY_CONFIG", "-e", "SENTRY_DSN", "--label", fmt.Sprintf("riju.deploy-config-hash=%s", deployCfgHash),