From 7fcdc1ab4bcb48d168cee0efd4344f685a2e5f0e Mon Sep 17 00:00:00 2001 From: Kelly McBride Date: Thu, 12 Mar 2026 20:41:21 -0700 Subject: [PATCH 1/2] rtm website move: rename server resisttechmonopolies.online to sootie.resisttechmonopolies.online --- .../website.resisttechmonopolies.online.env | 8 ++ .../auth.resisttechmonopolies.online.env | 130 ++++++++++++++++++ .../calibre.resisttechmonopolies.online.env | 0 .../collabora.resisttechmonopolies.online.env | 0 ...focalboard.resisttechmonopolies.online.env | 0 .../nextcloud.resisttechmonopolies.online.occ | 0 .../radicale.resisttechmonopolies.online.env | 0 .../resisttechmonopolies.online.env | 0 ...scj.sootie.resisttechmonopolies.online.env | 0 .../traefik.resisttechmonopolies.online.env | 0 10 files changed, 138 insertions(+) create mode 100644 abra/servers/laylotta.resisttechmonopolies.online/website.resisttechmonopolies.online.env create mode 100644 abra/servers/sootie.resisttechmonopolies.online/auth.resisttechmonopolies.online.env rename abra/servers/{resisttechmonopolies.online => sootie.resisttechmonopolies.online}/calibre.resisttechmonopolies.online.env (100%) rename abra/servers/{resisttechmonopolies.online => sootie.resisttechmonopolies.online}/collabora.resisttechmonopolies.online.env (100%) rename abra/servers/{resisttechmonopolies.online => sootie.resisttechmonopolies.online}/focalboard.resisttechmonopolies.online.env (100%) rename abra/servers/{resisttechmonopolies.online => sootie.resisttechmonopolies.online}/nextcloud.resisttechmonopolies.online.occ (100%) rename abra/servers/{resisttechmonopolies.online => sootie.resisttechmonopolies.online}/radicale.resisttechmonopolies.online.env (100%) rename abra/servers/{resisttechmonopolies.online => sootie.resisttechmonopolies.online}/resisttechmonopolies.online.env (100%) rename abra/servers/{resisttechmonopolies.online => sootie.resisttechmonopolies.online}/scj.sootie.resisttechmonopolies.online.env (100%) rename abra/servers/{resisttechmonopolies.online => sootie.resisttechmonopolies.online}/traefik.resisttechmonopolies.online.env (100%) diff --git a/abra/servers/laylotta.resisttechmonopolies.online/website.resisttechmonopolies.online.env b/abra/servers/laylotta.resisttechmonopolies.online/website.resisttechmonopolies.online.env new file mode 100644 index 0000000..fc1b912 --- /dev/null +++ b/abra/servers/laylotta.resisttechmonopolies.online/website.resisttechmonopolies.online.env @@ -0,0 +1,8 @@ +TYPE=rtm-astro-recipe:6e6418fb+U + +DOMAIN=website.resisttechmonopolies.online + +## Domain aliases +#EXTRA_DOMAINS=', `www.website.resisttechmonopolies.online`' + +LETS_ENCRYPT_ENV=production \ No newline at end of file diff --git a/abra/servers/sootie.resisttechmonopolies.online/auth.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/auth.resisttechmonopolies.online.env new file mode 100644 index 0000000..e5f7e54 --- /dev/null +++ b/abra/servers/sootie.resisttechmonopolies.online/auth.resisttechmonopolies.online.env @@ -0,0 +1,130 @@ +TYPE=authentik:7.4.0+2025.6.3 +TIMEOUT=900 +ENABLE_AUTO_UPDATE=true +POST_DEPLOY_CMDS="worker set_admin_pass" +# Example values for post deploy cmds: "worker set_admin_pass|worker apply_blueprints|worker add_applications" +LETS_ENCRYPT_ENV=production +ENABLE_BACKUPS=true + +DOMAIN=auth.resisttechmonopolies.online +## Domain aliases +#EXTRA_DOMAINS=', `www.auth.resisttechmonopolies.online`' +COMPOSE_FILE="compose.yml" +AUTHENTIK_DEFAULT_USER_CHANGE_USERNAME=false +AUTHENTIK_LOG_LEVEL=info +# AUTHENTIK_IMPERSONATION=true +# AUTHENTIK_FOOTER_LINKS='[{"name": "My Organization","href":"https://example.com"}]' +# WORKERS=1 + +## Outpost Integration +# COMPOSE_FILE="$COMPOSE_FILE:compose.outposts.yml" +# COMPOSE_FILE="$COMPOSE_FILE:compose.outposts.ldap.yml" +# SECRET_LDAP_TOKEN_VERSION=v1 + +## ADMIN +AUTHENTIK_BOOTSTRAP_EMAIL=ammar@ammaratef45.ddns.net + +## EMAIL +AUTHENTIK_EMAIL__HOST=smtp.protonmail.ch +AUTHENTIK_EMAIL__PORT=587 +AUTHENTIK_EMAIL__USERNAME="besties@resisttechmonopolies.online" +AUTHENTIK_EMAIL__USE_TLS=true +AUTHENTIK_EMAIL__USE_SSL=false +AUTHENTIK_EMAIL__TIMEOUT=10 +AUTHENTIK_EMAIL__FROM=besties@resisttechmonopolies.online + +## Secret Versions +SECRET_SECRET_KEY_VERSION=v1 +SECRET_DB_PASSWORD_VERSION=v1 +SECRET_ADMIN_TOKEN_VERSION=v1 +SECRET_ADMIN_PASS_VERSION=v1 +SECRET_EMAIL_PASS_VERSION=v2 + +# X_FRAME_OPTIONS_ALLOW_FROM=dashboard.example.org + +## FLOW OPTIONS +# WELCOME_MESSAGE="Welcome to Authentik" +# DEFAULT_LANGUAGE=en +# LOGOUT_REDIRECT="https://$DOMAIN" +# EMAIL_SUBJECT="Account Recovery" +# EMAIL_TOKEN_EXPIRY_MINUTES=30 + +COPY_ASSETS="flow_background.jpg|app:/web/dist/assets/images/" +COPY_ASSETS="$COPY_ASSETS icon_left_brand.svg|app:/web/dist/assets/icons/" +COPY_ASSETS="$COPY_ASSETS icon.png|app:/web/dist/assets/icons/" + +# Default CSS customisation +# COMPOSE_FILE="$COMPOSE_FILE:compose.css.yml" +# BACKGROUND_FONT_COLOR=white +# BACKGROUND_BOX_COLOR='#eaeaeacf' +# THEME_BACKGROUND="url('https://auth.resisttechmonopolies.online/static/dist/assets/images/flow_background.jpg'); background-position: center; background-repeat: no-repeat; background-size: cover;" + +COMPOSE_FILE="$COMPOSE_FILE:compose.nextcloud.yml" +NEXTCLOUD_DOMAIN=nextcloud.resisttechmonopolies.online +SECRET_NEXTCLOUD_ID_VERSION=v1 +SECRET_NEXTCLOUD_SECRET_VERSION=v1 +APP_ICONS="nextcloud:~/.abra/recipes/authentik/icons/nextcloud.png" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.wordpress.yml" +# WORDPRESS_DOMAIN=wordpress.example.com +# WORDPRESS_GROUP='wordpress Admins' +# SECRET_WORDPRESS_ID_VERSION=v1 +# SECRET_WORDPRESS_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS wordpress:~/.abra/recipes/authentik/icons/wordpress.png" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml" +# ELEMENT_DOMAIN=element-web.example.com +# MATRIX_DOMAIN=matrix-synapse.example.com +# SECRET_MATRIX_ID_VERSION=v1 +# SECRET_MATRIX_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS matrix:~/.abra/recipes/authentik/icons/matrix.svg" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.wekan.yml" +# WEKAN_DOMAIN=wekan.example.com +# SECRET_WEKAN_ID_VERSION=v1 +# SECRET_WEKAN_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS wekan:~/.abra/recipes/authentik/icons/wekan.png" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.vikunja.yml" +# VIKUNJA_DOMAIN=vikunja.example.com +# SECRET_VIKUNJA_ID_VERSION=v1 +# SECRET_VIKUNJA_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS vikunja:~/.abra/recipes/authentik/icons/vikunja.svg" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.outline.yml" +# OUTLINE_DOMAIN=outline.example.com +# SECRET_OUTLINE_ID_VERSION=v1 +# SECRET_OUTLINE_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS outline:~/.abra/recipes/authentik/icons/outline.png" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.kimai.yml" +# KIMAI_DOMAIN=kimai.example.com +# SECRET_KIMAI_ID_VERSION=v1 +# SECRET_KIMAI_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS kimai:~/.abra/recipes/authentik/icons/kimai_logo.png" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.zammad.yml" +# ZAMMAD_DOMAIN=zammad.example.com +# APP_ICONS="$APP_ICONS zammad:~/.abra/recipes/authentik/icons/zammad.svg" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.monitoring.yml" +# MONITORING_DOMAIN=monitoring.example.com +# SECRET_MONITORING_ID_VERSION=v1 +# SECRET_MONITORING_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS monitoring:~/.abra/recipes/authentik/icons/monitoring.svg" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.rallly.yml" +# RALLLY_DOMAIN=rallly.example.com +# SECRET_RALLLY_ID_VERSION=v1 +# SECRET_RALLLY_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS rallly:~/.abra/recipes/authentik/icons/rallly.png" + +# COMPOSE_FILE="$COMPOSE_FILE:compose.hedgedoc.yml" +# HEDGEDOC_DOMAIN=hedgedoc.example.com +# SECRET_HEDGEDOC_ID_VERSION=v1 +# SECRET_HEDGEDOC_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS hedgedoc:~/.abra/recipes/authentik/icons/hedgedoc.png" + +# APPLICATIONS='{"Calendar": "https://nextcloud.example.com/apps/calendar/", "BBB": "https://nextcloud.example.com/apps/bbb/"}' +# APP_ICONS="$APP_ICONS Calendar:~/.abra/recipes/authentik/icons/calendar.svg" +# APP_ICONS="$APP_ICONS BBB:~/.abra/recipes/authentik/icons/bbb.png" \ No newline at end of file diff --git a/abra/servers/resisttechmonopolies.online/calibre.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/calibre.resisttechmonopolies.online.env similarity index 100% rename from abra/servers/resisttechmonopolies.online/calibre.resisttechmonopolies.online.env rename to abra/servers/sootie.resisttechmonopolies.online/calibre.resisttechmonopolies.online.env diff --git a/abra/servers/resisttechmonopolies.online/collabora.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/collabora.resisttechmonopolies.online.env similarity index 100% rename from abra/servers/resisttechmonopolies.online/collabora.resisttechmonopolies.online.env rename to abra/servers/sootie.resisttechmonopolies.online/collabora.resisttechmonopolies.online.env diff --git a/abra/servers/resisttechmonopolies.online/focalboard.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/focalboard.resisttechmonopolies.online.env similarity index 100% rename from abra/servers/resisttechmonopolies.online/focalboard.resisttechmonopolies.online.env rename to abra/servers/sootie.resisttechmonopolies.online/focalboard.resisttechmonopolies.online.env diff --git a/abra/servers/resisttechmonopolies.online/nextcloud.resisttechmonopolies.online.occ b/abra/servers/sootie.resisttechmonopolies.online/nextcloud.resisttechmonopolies.online.occ similarity index 100% rename from abra/servers/resisttechmonopolies.online/nextcloud.resisttechmonopolies.online.occ rename to abra/servers/sootie.resisttechmonopolies.online/nextcloud.resisttechmonopolies.online.occ diff --git a/abra/servers/resisttechmonopolies.online/radicale.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/radicale.resisttechmonopolies.online.env similarity index 100% rename from abra/servers/resisttechmonopolies.online/radicale.resisttechmonopolies.online.env rename to abra/servers/sootie.resisttechmonopolies.online/radicale.resisttechmonopolies.online.env diff --git a/abra/servers/resisttechmonopolies.online/resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/resisttechmonopolies.online.env similarity index 100% rename from abra/servers/resisttechmonopolies.online/resisttechmonopolies.online.env rename to abra/servers/sootie.resisttechmonopolies.online/resisttechmonopolies.online.env diff --git a/abra/servers/resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env similarity index 100% rename from abra/servers/resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env rename to abra/servers/sootie.resisttechmonopolies.online/scj.sootie.resisttechmonopolies.online.env diff --git a/abra/servers/resisttechmonopolies.online/traefik.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/traefik.resisttechmonopolies.online.env similarity index 100% rename from abra/servers/resisttechmonopolies.online/traefik.resisttechmonopolies.online.env rename to abra/servers/sootie.resisttechmonopolies.online/traefik.resisttechmonopolies.online.env -- 2.49.0 From 8aff62e4efb735e09d90d983b298f79d6cfc65c0 Mon Sep 17 00:00:00 2001 From: Kelly McBride Date: Thu, 12 Mar 2026 21:18:44 -0700 Subject: [PATCH 2/2] remove auth entry from sootie; that was a bad rebase artifact --- .../auth.resisttechmonopolies.online.env | 130 ------------------ 1 file changed, 130 deletions(-) delete mode 100644 abra/servers/sootie.resisttechmonopolies.online/auth.resisttechmonopolies.online.env diff --git a/abra/servers/sootie.resisttechmonopolies.online/auth.resisttechmonopolies.online.env b/abra/servers/sootie.resisttechmonopolies.online/auth.resisttechmonopolies.online.env deleted file mode 100644 index e5f7e54..0000000 --- a/abra/servers/sootie.resisttechmonopolies.online/auth.resisttechmonopolies.online.env +++ /dev/null @@ -1,130 +0,0 @@ -TYPE=authentik:7.4.0+2025.6.3 -TIMEOUT=900 -ENABLE_AUTO_UPDATE=true -POST_DEPLOY_CMDS="worker set_admin_pass" -# Example values for post deploy cmds: "worker set_admin_pass|worker apply_blueprints|worker add_applications" -LETS_ENCRYPT_ENV=production -ENABLE_BACKUPS=true - -DOMAIN=auth.resisttechmonopolies.online -## Domain aliases -#EXTRA_DOMAINS=', `www.auth.resisttechmonopolies.online`' -COMPOSE_FILE="compose.yml" -AUTHENTIK_DEFAULT_USER_CHANGE_USERNAME=false -AUTHENTIK_LOG_LEVEL=info -# AUTHENTIK_IMPERSONATION=true -# AUTHENTIK_FOOTER_LINKS='[{"name": "My Organization","href":"https://example.com"}]' -# WORKERS=1 - -## Outpost Integration -# COMPOSE_FILE="$COMPOSE_FILE:compose.outposts.yml" -# COMPOSE_FILE="$COMPOSE_FILE:compose.outposts.ldap.yml" -# SECRET_LDAP_TOKEN_VERSION=v1 - -## ADMIN -AUTHENTIK_BOOTSTRAP_EMAIL=ammar@ammaratef45.ddns.net - -## EMAIL -AUTHENTIK_EMAIL__HOST=smtp.protonmail.ch -AUTHENTIK_EMAIL__PORT=587 -AUTHENTIK_EMAIL__USERNAME="besties@resisttechmonopolies.online" -AUTHENTIK_EMAIL__USE_TLS=true -AUTHENTIK_EMAIL__USE_SSL=false -AUTHENTIK_EMAIL__TIMEOUT=10 -AUTHENTIK_EMAIL__FROM=besties@resisttechmonopolies.online - -## Secret Versions -SECRET_SECRET_KEY_VERSION=v1 -SECRET_DB_PASSWORD_VERSION=v1 -SECRET_ADMIN_TOKEN_VERSION=v1 -SECRET_ADMIN_PASS_VERSION=v1 -SECRET_EMAIL_PASS_VERSION=v2 - -# X_FRAME_OPTIONS_ALLOW_FROM=dashboard.example.org - -## FLOW OPTIONS -# WELCOME_MESSAGE="Welcome to Authentik" -# DEFAULT_LANGUAGE=en -# LOGOUT_REDIRECT="https://$DOMAIN" -# EMAIL_SUBJECT="Account Recovery" -# EMAIL_TOKEN_EXPIRY_MINUTES=30 - -COPY_ASSETS="flow_background.jpg|app:/web/dist/assets/images/" -COPY_ASSETS="$COPY_ASSETS icon_left_brand.svg|app:/web/dist/assets/icons/" -COPY_ASSETS="$COPY_ASSETS icon.png|app:/web/dist/assets/icons/" - -# Default CSS customisation -# COMPOSE_FILE="$COMPOSE_FILE:compose.css.yml" -# BACKGROUND_FONT_COLOR=white -# BACKGROUND_BOX_COLOR='#eaeaeacf' -# THEME_BACKGROUND="url('https://auth.resisttechmonopolies.online/static/dist/assets/images/flow_background.jpg'); background-position: center; background-repeat: no-repeat; background-size: cover;" - -COMPOSE_FILE="$COMPOSE_FILE:compose.nextcloud.yml" -NEXTCLOUD_DOMAIN=nextcloud.resisttechmonopolies.online -SECRET_NEXTCLOUD_ID_VERSION=v1 -SECRET_NEXTCLOUD_SECRET_VERSION=v1 -APP_ICONS="nextcloud:~/.abra/recipes/authentik/icons/nextcloud.png" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.wordpress.yml" -# WORDPRESS_DOMAIN=wordpress.example.com -# WORDPRESS_GROUP='wordpress Admins' -# SECRET_WORDPRESS_ID_VERSION=v1 -# SECRET_WORDPRESS_SECRET_VERSION=v1 -# APP_ICONS="$APP_ICONS wordpress:~/.abra/recipes/authentik/icons/wordpress.png" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml" -# ELEMENT_DOMAIN=element-web.example.com -# MATRIX_DOMAIN=matrix-synapse.example.com -# SECRET_MATRIX_ID_VERSION=v1 -# SECRET_MATRIX_SECRET_VERSION=v1 -# APP_ICONS="$APP_ICONS matrix:~/.abra/recipes/authentik/icons/matrix.svg" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.wekan.yml" -# WEKAN_DOMAIN=wekan.example.com -# SECRET_WEKAN_ID_VERSION=v1 -# SECRET_WEKAN_SECRET_VERSION=v1 -# APP_ICONS="$APP_ICONS wekan:~/.abra/recipes/authentik/icons/wekan.png" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.vikunja.yml" -# VIKUNJA_DOMAIN=vikunja.example.com -# SECRET_VIKUNJA_ID_VERSION=v1 -# SECRET_VIKUNJA_SECRET_VERSION=v1 -# APP_ICONS="$APP_ICONS vikunja:~/.abra/recipes/authentik/icons/vikunja.svg" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.outline.yml" -# OUTLINE_DOMAIN=outline.example.com -# SECRET_OUTLINE_ID_VERSION=v1 -# SECRET_OUTLINE_SECRET_VERSION=v1 -# APP_ICONS="$APP_ICONS outline:~/.abra/recipes/authentik/icons/outline.png" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.kimai.yml" -# KIMAI_DOMAIN=kimai.example.com -# SECRET_KIMAI_ID_VERSION=v1 -# SECRET_KIMAI_SECRET_VERSION=v1 -# APP_ICONS="$APP_ICONS kimai:~/.abra/recipes/authentik/icons/kimai_logo.png" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.zammad.yml" -# ZAMMAD_DOMAIN=zammad.example.com -# APP_ICONS="$APP_ICONS zammad:~/.abra/recipes/authentik/icons/zammad.svg" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.monitoring.yml" -# MONITORING_DOMAIN=monitoring.example.com -# SECRET_MONITORING_ID_VERSION=v1 -# SECRET_MONITORING_SECRET_VERSION=v1 -# APP_ICONS="$APP_ICONS monitoring:~/.abra/recipes/authentik/icons/monitoring.svg" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.rallly.yml" -# RALLLY_DOMAIN=rallly.example.com -# SECRET_RALLLY_ID_VERSION=v1 -# SECRET_RALLLY_SECRET_VERSION=v1 -# APP_ICONS="$APP_ICONS rallly:~/.abra/recipes/authentik/icons/rallly.png" - -# COMPOSE_FILE="$COMPOSE_FILE:compose.hedgedoc.yml" -# HEDGEDOC_DOMAIN=hedgedoc.example.com -# SECRET_HEDGEDOC_ID_VERSION=v1 -# SECRET_HEDGEDOC_SECRET_VERSION=v1 -# APP_ICONS="$APP_ICONS hedgedoc:~/.abra/recipes/authentik/icons/hedgedoc.png" - -# APPLICATIONS='{"Calendar": "https://nextcloud.example.com/apps/calendar/", "BBB": "https://nextcloud.example.com/apps/bbb/"}' -# APP_ICONS="$APP_ICONS Calendar:~/.abra/recipes/authentik/icons/calendar.svg" -# APP_ICONS="$APP_ICONS BBB:~/.abra/recipes/authentik/icons/bbb.png" \ No newline at end of file -- 2.49.0