bad merge

Reviewed-on: #3

.gitignore

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

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

@@ -1,4 +1,4 @@
-TYPE=loomio:5.1.2+v3.0.0
+TYPE=loomio:5.1.3+v3.0.0
 COMPOSE_FILE="compose.yml"
 
 DOMAIN=loomio.resisttechmonopolies.online

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="<user-id>"
+#GF_MATRIX_ROOM_ID="<room-id>"
+#GF_MATRIX_HOMESERVER_URL="<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

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                                                #

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