bad merge

.gitignore

@@ -1,4 +1,4 @@
 *~
 abra/catalogue
 abra/recipes
-abra/logs
+abra/logs

abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.env

@@ -1,4 +1,4 @@
-TYPE=monitoring-ng:423b9bcf+U
+TYPE=monitoring-ng:1.6.0+v1.8.1
 LETS_ENCRYPT_ENV=production
 COMPOSE_FILE=compose.yml
 DOMAIN=m.laylotta.resisttechmonopolies.online
@@ -6,32 +6,33 @@ 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.${DOMAIN}/loki/api/v1/push
+# 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"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.expose-ports.yml"
 
 # Monitoring Server
 #
 ## Prometheus
-COMPOSE_FILE="$COMPOSE_FILE:compose.prometheus.yml"
-PROMETHEUS_RETENTION_TIME=1y
-
+# COMPOSE_FILE="$COMPOSE_FILE:compose.prometheus.yml"
+# PROMETHEUS_RETENTION_TIME=1y
+#
 ## Prometheus Pushgateway
-COMPOSE_FILE="$COMPOSE_FILE:compose.pushgateway.yml"
-
+# COMPOSE_FILE="$COMPOSE_FILE:compose.pushgateway.yml"
+#
 ## Loki
 # Loki Server
-COMPOSE_FILE="$COMPOSE_FILE:compose.loki.yml"
-
+#
+# COMPOSE_FILE="$COMPOSE_FILE:compose.loki.yml"
+#
 # Set to 0 to disable retention
-LOKI_RETENTION_PERIOD=744h
-LOKI_STORAGE_FILESYSTEM=1
-
+# LOKI_RETENTION_PERIOD=744h
+# LOKI_STORAGE_FILESYSTEM=1
+#
 ## S3 Storage
 # LOKI_STORAGE_S3=1
 # LOKI_AWS_ENDPOINT=https://minio.autonomic.zone

abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.scrape-config.yml

@@ -1,6 +0,0 @@
-# https://git.coopcloud.tech/coop-cloud/monitoring-ng/src/branch/main/scrape-config.example.yml
-# https://prometheus.io/docs/prometheus/latest/getting_started/#configure-prometheus-to-monitor-the-sample-targets
-- targets
-  - 'm.laylotta.resisttechmonopolies.online:8082'
-  - 'node.m.laylotta.resisttechmonopolies.online'
-  - 'cadvisor.m.laylotta.resisttechmonopolies.online'

abra/servers/laylotta.resisttechmonopolies.online/resisttechmonopolies.online.env

@@ -1,9 +0,0 @@
-TYPE=rtm-astro-recipe:6e6418fb
-
-DOMAIN=resisttechmonopolies.online
-
-## Domain aliases
-#EXTRA_DOMAINS=', `www.website.resisttechmonopolies.online`'
-
-LETS_ENCRYPT_ENV=production
-VERSION=0.0.21

abra/servers/resisttechmonopolies.online/draupnir.resisttechmonopolies.online.env

@@ -0,0 +1,31 @@
+TYPE=draupnir:785815dd+U
+
+DOMAIN=draupnir.resisttechmonopolies.online
+
+## Domain aliases
+#EXTRA_DOMAINS=', `www.draupnir.resisttechmonopolies.online`'
+
+LETS_ENCRYPT_ENV=production
+
+HOME_SERVER_URL="https://matrix.resisttechmonopolies.online"
+RAW_HOMESERVER_URL="https://matrix.resisttechmonopolies.online"
+DRAUPNIR_LOG_LEVEL="DEBUG"
+
+# The room ID (or room alias) of the management room, anyone in this room can issue commands to Draupnir.
+#
+# Draupnir has no more granular access controls other than this, be sure you trust everyone in this room - secure it!
+#
+# This should be a room alias or room ID - not a matrix.to URL.
+#
+# Note: By default, Draupnir is fairly verbose - expect a lot of messages in this room.
+# (see verboseLogging to adjust this a bit.)
+MANAGEMENT_ROOM="!KTOGIJKnLqziezPzuO:matrix.org" 
+
+# If true (the default), Draupnir will only accept invites from users present in managementRoom.
+AUTO_JOIN_ONLY_IF_MANAGER=true
+
+# If `autojoinOnlyIfManager` is false, only the members in this space can invite
+# the bot to new rooms.
+# ACCEPT_INVITES_FROM_SPACE="!example:example.org"
+
+ACCESS_TOKEN_VERSION=v1

abra/servers/resisttechmonopolies.online/maubot.resisttechmonopolies.online.env

@@ -0,0 +1,18 @@
+TYPE=maubot:f5b93759+U
+
+DOMAIN=maubot.resisttechmonopolies.online
+
+## Domain aliases
+#EXTRA_DOMAINS=', `www.maubot.resisttechmonopolies.online`'
+
+LETS_ENCRYPT_ENV=production
+
+HOMESERVER_HOST=matrix.resisttechmonopolies.online
+# Client-server API URL
+HOMESERVER_URL=https://matrix.resisttechmonopolies.online
+
+ADMIN_USER_NAME=charlie
+
+## Secrets
+SECRET_ADMIN_PASSWORD_VERSION=v1
+SECRET_HOMESERVER_REGISTRATION_VERSION=v1

abra/servers/resisttechmonopolies.online/resisttechmonopolies.online.env

@@ -0,0 +1,10 @@
+TYPE=rtm-astro-recipe:6e6418f
+
+DOMAIN=resisttechmonopolies.online
+
+## Domain aliases
+#EXTRA_DOMAINS=', `www.resisttechmonopolies.online`'
+
+LETS_ENCRYPT_ENV=production
+
+VERSION=0.0.10