bad merge

.gitignore

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

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/hedgedoc.resisttechmonopolies.online.env

@@ -1,59 +0,0 @@
-TYPE=hedgedoc:3.0.8+1.10.7
-TIMEOUT=300
-ENABLE_AUTO_UPDATE=true
-ENABLE_BACKUPS=true
-
-DOMAIN=hedgedoc.resisttechmonopolies.online
-## Domain aliases
-#EXTRA_DOMAINS=', `www.hedgedoc.resisttechmonopolies.online`'
-LETS_ENCRYPT_ENV=production
-
-SECRET_SESSION_SECRET_VERSION=v1
-
-COMPOSE_FILE="compose.yml"
-
-# Anubis
-#COMPOSE_FILE="$COMPOSE_FILE:compose.anubis.yml"
-
-# PostgreSQL
-
-#COMPOSE_FILE="$COMPOSE_FILE:compose.postgresql.yml"
-#SECRET_DB_PASSWORD_VERSION=v1
-
-# OAuth, see https://docs.hedgedoc.org/guides/auth/keycloak/
-
-#COMPOSE_FILE="$COMPOSE_FILE:compose.oauth.yml"
-#CMD_OAUTH2_PROVIDERNAME="Keycloak"
-#CMD_OAUTH2_CLIENT_ID="hedgedoc"
-#CMD_OAUTH2_AUTHORIZATION_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/auth"
-#CMD_OAUTH2_TOKEN_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/token"
-#CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo"
-#CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=ocs.data.id
-#CMD_OAUTH2_USER_PROFILE_ID_ATTR=
-#CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=ocs.data.display-name
-#CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=ocs.data.email
-#CMD_OAUTH2_PROVIDERNAME=Keycloak
-#CMD_OAUTH2_SCOPE="openid email profile"
-#
-#SECRET_OAUTH_KEY_VERSION=v1
-
-# Options, see https://docs.hedgedoc.org/configuration/
-
-# CMD_ALLOW_ANONYMOUS=true
-# CMD_ALLOW_ANONYMOUS_EDITS=false
-# CMD_ALLOW_EMAIL_REGISTER=true
-# CMD_ALLOW_FREEURL=false
-# CMD_REQUIRE_FREEURL_AUTHENTICATION=true
-# CMD_ALLOW_GRAVATAR=true
-# CMD_ALLOW_ORIGIN=localhost
-# CMD_COOKIE_POLICY=lax
-# CMD_CSP_ADD_DISQUS=false
-# CMD_CSP_ADD_GOOGLE_ANALYTICS=false
-# CMD_CSP_ENABLE=true
-# CMD_CSP_REPORTURI=undefined
-# CMD_DEFAULT_PERMISSION=editable
-# CMD_EMAIL=true
-# CMD_SESSION_LIFE=1209600000
-# Only present in config.json (no equivalent env var):
-# DOCUMENT_MAX_LENGTH=100000
-# CMD_ENABLE_UPLOADS=registered

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