From 8e3492e5337706c06d797a6f0360cec505b530ba Mon Sep 17 00:00:00 2001
From: Linnea <linnealovespie@proton.me>
Date: Thu, 26 Feb 2026 22:00:21 -0800
Subject: [PATCH 1/3] add draupnir recipe

---
 .../draupnir.resisttechmonopolies.online.env  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 abra/servers/resisttechmonopolies.online/draupnir.resisttechmonopolies.online.env

diff --git a/abra/servers/resisttechmonopolies.online/draupnir.resisttechmonopolies.online.env b/abra/servers/resisttechmonopolies.online/draupnir.resisttechmonopolies.online.env
new file mode 100644
index 0000000..31d835a
--- /dev/null
+++ b/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
\ No newline at end of file
-- 
2.49.0


From 04921c8e4491f2e05820ba195a28f84cdfd45023 Mon Sep 17 00:00:00 2001
From: Linnea <linnealovespie@proton.me>
Date: Thu, 26 Feb 2026 22:17:26 -0800
Subject: [PATCH 2/3] maubot and gitignore

---
 .gitignore                                     |  5 ++++-
 .../maubot.resisttechmonopolies.online.env     | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 abra/servers/resisttechmonopolies.online/maubot.resisttechmonopolies.online.env

diff --git a/.gitignore b/.gitignore
index 8a72087..e96319a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-.*~
\ No newline at end of file
+.*~
+abra/catalogue
+abra/recipes
+abra/logs
diff --git a/abra/servers/resisttechmonopolies.online/maubot.resisttechmonopolies.online.env b/abra/servers/resisttechmonopolies.online/maubot.resisttechmonopolies.online.env
new file mode 100644
index 0000000..e1221e2
--- /dev/null
+++ b/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
\ No newline at end of file
-- 
2.49.0


From f1c79ecd5104492e32fcc2951328dc40df572bfd Mon Sep 17 00:00:00 2001
From: Linnea <linnealovespie@proton.me>
Date: Thu, 26 Feb 2026 22:22:44 -0800
Subject: [PATCH 3/3] bad merge

---
 .gitignore | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4687843..5c54467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
-.*~
-abra/catalogue
-abra/recipes
-abra/logs
-=======
 *~
 abra/catalogue
 abra/recipes
 abra/logs
->>>>>>> origin/main
-- 
2.49.0