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/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