From 3ce8928ea78dba3418d9c273411b28ad6e5a5453 Mon Sep 17 00:00:00 2001 From: Ammar Hussein Date: Mon, 19 Jan 2026 22:17:30 -0800 Subject: [PATCH 1/7] update smtp env values --- .../loomio.resisttechmonopolies.online.env | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env b/abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env index f8e473e..fdd0010 100644 --- a/abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env +++ b/abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env @@ -10,13 +10,13 @@ LETS_ENCRYPT_ENV=production COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml" SUPPORT_EMAIL=besties@resisttechmonopolies.online SMTP_AUTH=plain -SMTP_DOMAIN=smtp.protonmail.ch -SMTP_SERVER=smtp.protonmail.ch -SMTP_PORT=587 +SMTP_DOMAIN=mail.resisttechmonopolies.online +SMTP_SERVER=mail.resisttechmonopolies.online +SMTP_PORT=465 SMTP_USERNAME=besties@resisttechmonopolies.online -# SMTP_USE_SSL=1 +SMTP_USE_SSL=1 # to disable SSL comment out line rather than changing to 0 -SECRET_SMTP_PASSWORD_VERSION=v2 +SECRET_SMTP_PASSWORD_VERSION=v4 # From field for notification e-mails @@ -104,4 +104,4 @@ OAUTH_ATTR_UID=email OAUTH_ATTR_NAME=name OAUTH_ATTR_EMAIL=email OAUTH_LOGIN_PROVIDER_NAME="loomio SSO" -SECRET_OAUTH_APP_SECRET_VERSION=v2 +SECRET_OAUTH_APP_SECRET_VERSION=v2 \ No newline at end of file From 9416b318e32f8d9ce1bd6861524d1fb197ec67c1 Mon Sep 17 00:00:00 2001 From: Ammar Hussein Date: Wed, 21 Jan 2026 00:24:10 -0800 Subject: [PATCH 2/7] deploy swarm-cronjob on sootie --- .../scj.sootie.resisttechmonopolies.online.env | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 abra/servers/resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env diff --git a/abra/servers/resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env b/abra/servers/resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env new file mode 100644 index 0000000..1136308 --- /dev/null +++ b/abra/servers/resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env @@ -0,0 +1,5 @@ +RECIPE=swarm-cronjob:1.11.0+1.15.0 + +TZ=UTC +LOG_LEVEL=info +LOG_JSON=false \ No newline at end of file From 6d59a4a00ed5b4dc877736adb451c114d82de2fd Mon Sep 17 00:00:00 2001 From: Ammar Hussein Date: Wed, 21 Jan 2026 00:25:31 -0800 Subject: [PATCH 3/7] deploy swarm-cronjob on laylotta --- .../scj.laylotta.resisttechmonopolies.online.env | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 abra/servers/laylotta.resisttechmonopolies.online/scj.laylotta.resisttechmonopolies.online.env diff --git a/abra/servers/laylotta.resisttechmonopolies.online/scj.laylotta.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/scj.laylotta.resisttechmonopolies.online.env new file mode 100644 index 0000000..1136308 --- /dev/null +++ b/abra/servers/laylotta.resisttechmonopolies.online/scj.laylotta.resisttechmonopolies.online.env @@ -0,0 +1,5 @@ +RECIPE=swarm-cronjob:1.11.0+1.15.0 + +TZ=UTC +LOG_LEVEL=info +LOG_JSON=false \ No newline at end of file From 06a3bfba17b83f6be96f07943e90c0a15a7176f7 Mon Sep 17 00:00:00 2001 From: ammar Date: Thu, 19 Feb 2026 20:20:10 -0800 Subject: [PATCH 4/7] move loomio from sootie to laylotta --- .gitignore | 5 ++++- .../loomio.resisttechmonopolies.online.env | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) rename abra/servers/{resisttechmonopolies.online => laylotta.resisttechmonopolies.online}/loomio.resisttechmonopolies.online.env (99%) diff --git a/.gitignore b/.gitignore index 8a72087..c692135 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -.*~ \ No newline at end of file +.*~ +abra/catalogue +abra/recipes +abra/logs \ No newline at end of file diff --git a/abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env similarity index 99% rename from abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env rename to abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env index fdd0010..97a7548 100644 --- a/abra/servers/resisttechmonopolies.online/loomio.resisttechmonopolies.online.env +++ b/abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env @@ -1,4 +1,4 @@ -TYPE=loomio:5.1.2+v3.0.0 +TYPE=loomio:6a7050cd COMPOSE_FILE="compose.yml" DOMAIN=loomio.resisttechmonopolies.online From 2113e9fcdff422aeb281658cef1ae55f41027314 Mon Sep 17 00:00:00 2001 From: David Bergvelt Date: Thu, 19 Feb 2026 20:19:19 -0800 Subject: [PATCH 5/7] deploy backup-bot-two to mango --- .../bbt.mango.resisttechmonopolies.online.env | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 abra/servers/mango.resisttechmonopolies.online/bbt.mango.resisttechmonopolies.online.env diff --git a/abra/servers/mango.resisttechmonopolies.online/bbt.mango.resisttechmonopolies.online.env b/abra/servers/mango.resisttechmonopolies.online/bbt.mango.resisttechmonopolies.online.env new file mode 100644 index 0000000..2bee5cb --- /dev/null +++ b/abra/servers/mango.resisttechmonopolies.online/bbt.mango.resisttechmonopolies.online.env @@ -0,0 +1,34 @@ +TYPE=backup-bot-two:2.3.0+2.3.0-beta + +SECRET_RESTIC_PASSWORD_VERSION=v1 + +COMPOSE_FILE=compose.yml + +RESTIC_REPOSITORY=/backups/restic + +CRON_SCHEDULE='30 3 * * *' + +# Push Notifiactions +#PUSH_URL_START=https://status.example.com/api/push/xxxxxxxxxx?status=up&msg=start +#PUSH_URL_SUCCESS=https://status.example.com/api/push/xxxxxxxxxx?status=up&msg=OK +#PUSH_URL_FAIL=https://status.example.com/api/push/xxxxxxxxxx?status=down&msg=fail + +# swarm-cronjob, instead of built-in cron +#COMPOSE_FILE="$COMPOSE_FILE:compose.swarm-cronjob.yml" + +# SSH storage +#SECRET_SSH_KEY_VERSION=v1 +#SSH_HOST_KEY="hostname ssh-rsa AAAAB3... +#COMPOSE_FILE="$COMPOSE_FILE:compose.ssh.yml" + +# S3 storage +#SECRET_AWS_SECRET_ACCESS_KEY_VERSION=v1 +#AWS_ACCESS_KEY_ID=something-secret +#COMPOSE_FILE="$COMPOSE_FILE:compose.s3.yml" + +# Secret restic repository +# use a secret to store the RESTIC_REPOSITORY if the repository location contains a secret value +# i.E rest:https://user:SECRET_PASSWORD@host:8000/ +# it overwrites the RESTIC_REPOSITORY variable +SECRET_RESTIC_REPO_VERSION=v2 +COMPOSE_FILE="$COMPOSE_FILE:compose.secret.yml" \ No newline at end of file From 1c419f5eba86a7f8c2e654105fc8ab854873eed7 Mon Sep 17 00:00:00 2001 From: ammar Date: Thu, 19 Feb 2026 20:31:41 -0800 Subject: [PATCH 6/7] update loomio version --- .../loomio.resisttechmonopolies.online.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env index 97a7548..4247942 100644 --- a/abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env +++ b/abra/servers/laylotta.resisttechmonopolies.online/loomio.resisttechmonopolies.online.env @@ -1,4 +1,4 @@ -TYPE=loomio:6a7050cd +TYPE=loomio:5.1.3+v3.0.0 COMPOSE_FILE="compose.yml" DOMAIN=loomio.resisttechmonopolies.online From 978c10a361a46463232491adb3e1e0b0207d7c00 Mon Sep 17 00:00:00 2001 From: ammar Date: Mon, 23 Feb 2026 20:42:48 -0800 Subject: [PATCH 7/7] deploy monitoring-ng recipe to laylotta --- .gitignore | 2 +- ...m.laylotta.resisttechmonopolies.online.env | 85 +++++++++++++++++++ ...t.laylotta.resisttechmonopolies.online.env | 6 +- 3 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.env diff --git a/.gitignore b/.gitignore index c692135..ad25f45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.*~ +*~ abra/catalogue abra/recipes abra/logs \ No newline at end of file diff --git a/abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.env new file mode 100644 index 0000000..e9eaae2 --- /dev/null +++ b/abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.env @@ -0,0 +1,85 @@ +TYPE=monitoring-ng:1.6.0+v1.8.1 +LETS_ENCRYPT_ENV=production +COMPOSE_FILE=compose.yml +DOMAIN=m.laylotta.resisttechmonopolies.online +TIMEOUT=120 +ENABLE_BACKUPS=true + +## Enable this secret for Promtail / Prometheus +# SECRET_BASIC_AUTH_VERSION=v1 +# +# Promtail (Gathering Logs) +# COMPOSE_FILE="$COMPOSE_FILE:compose.promtail.yml" +# LOKI_PUSH_URL=https://loki.monitoring.example.org/loki/api/v1/push + +## Expose node and cadvisor ports instead of traefik +# COMPOSE_FILE="$COMPOSE_FILE:compose.expose-ports.yml" + +# Monitoring Server +# +## Prometheus +# COMPOSE_FILE="$COMPOSE_FILE:compose.prometheus.yml" +# PROMETHEUS_RETENTION_TIME=1y +# +## Prometheus Pushgateway +# COMPOSE_FILE="$COMPOSE_FILE:compose.pushgateway.yml" +# +## Loki +# Loki Server +# +# COMPOSE_FILE="$COMPOSE_FILE:compose.loki.yml" +# +# Set to 0 to disable retention +# LOKI_RETENTION_PERIOD=744h +# LOKI_STORAGE_FILESYSTEM=1 +# +## S3 Storage +# LOKI_STORAGE_S3=1 +# LOKI_AWS_ENDPOINT=https://minio.autonomic.zone +# LOKI_AWS_REGION=eu-west-1 +# LOKI_ACCESS_KEY_ID=bush-debrief-approval-robust-scraggly-molecule +# LOKI_BUCKET_NAMES=loki +# SECRET_LOKI_AWS_SECRET_ACCESS_KEY_VERSION=v1 +# +## Grafana +# +# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana.yml" +# GF_SERVER_ROOT_URL=https://monitoring.example.com +# SECRET_GRAFANA_ADMIN_PASSWORD_VERSION=v1 +## Seperate domain for Grafana +#GRAFANA_DOMAIN=grafana.example.com +# +## Single-Sign-On with OIDC +# OIDC_ENABLED=1 +# SECRET_GRAFANA_OIDC_CLIENT_SECRET_VERSION=v1 +# OIDC_CLIENT_ID=grafana +# OIDC_AUTH_URL="https://authentik.example.com/application/o/authorize/" +# OIDC_API_URL="https://authentik.example.com/application/o/userinfo/" +# OIDC_TOKEN_URL="https://authentik.example.com/application/o/token/" +# +## Additional grafana settings (unlikely to require editing) +# GF_SECURITY_ALLOW_EMBEDDING=1 +# GF_INSTALL_PLUGINS=grafana-piechart-panel +# +## grafana SMTP configuration (optional) +# GF_SMTP_HOST=changeme +# GF_SMTP_USER=changme +# GF_SMTP_ENABLED=true +# GF_SMTP_FROM_ADDRESS=grafana@example.com +# GF_SMTP_SKIP_VERIFY=false +# SECRET_GRAFANA_SMTP_PASSWORD_VERSION=v1 +# + +## Grafana Matrix Contact Point (optional) +#COMPOSE_FILE="$COMPOSE_FILE:compose.matrix-alertmanager-receiver.yml" +#SECRET_MATRIX_ACCESS_TOKEN_VERSION=v1 +#GF_MATRIX_USER_ID="" +#GF_MATRIX_ROOM_ID="" +#GF_MATRIX_HOMESERVER_URL="" + +# ALerts +#ALERT_BACKUP_FAILED_ENABLED=true +#ALERT_BACKUP_MISSING_ENABLED=true +#ALERT_BACKUP_NOT_SUCCESSFULL_ENABLED=true +#ALERT_NODE_DISK_SPACE_ENABLED=true +#ALERT_NODE_MEMORY_USAGE_ENABLED=true \ No newline at end of file diff --git a/abra/servers/laylotta.resisttechmonopolies.online/t.laylotta.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/t.laylotta.resisttechmonopolies.online.env index 5602bb7..35a3c81 100644 --- a/abra/servers/laylotta.resisttechmonopolies.online/t.laylotta.resisttechmonopolies.online.env +++ b/abra/servers/laylotta.resisttechmonopolies.online/t.laylotta.resisttechmonopolies.online.env @@ -96,9 +96,9 @@ COMPOSE_FILE="compose.yml" ## BASIC_AUTH ## Use httpasswd to generate the secret -#COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml" -#BASIC_AUTH=1 -#SECRET_USERSFILE_VERSION=v1 +COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml" +BASIC_AUTH=1 +SECRET_USERSFILE_VERSION=v1 ##################################################################### # Prometheus metrics #