summary refs log tree commit diff
path: root/host
diff options
context:
space:
mode:
Diffstat (limited to 'host')
-rw-r--r--host/Rory-desktop/configuration.nix3
-rw-r--r--host/Rory-ovh/services/containers/draupnir-ansible/services/draupnir.nix8
-rw-r--r--host/Rory-ovh/services/containers/draupnir-belibre/container.nix4
-rw-r--r--host/Rory-ovh/services/containers/draupnir-belibre/services/draupnir.nix40
-rw-r--r--host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix8
-rw-r--r--host/Rory-ovh/services/containers/spacebar/services/spacebar.nix1
-rwxr-xr-xhost/Rory-ovh/services/matrix/draupnir.nix41
7 files changed, 98 insertions, 7 deletions
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix

index 06f84c9..20078d9 100644 --- a/host/Rory-desktop/configuration.nix +++ b/host/Rory-desktop/configuration.nix
@@ -19,6 +19,8 @@ args@{ ../../modules/software-templates/eid-mw.nix ../../modules/software-templates/devenv/dotnet.nix ../../modules/software-templates/devenv/javascript.nix + ../../modules/software-templates/devenv/go.nix + ../../modules/software-templates/devenv/java.nix ./services/nginx.nix ./services/postgres.nix @@ -190,6 +192,7 @@ args@{ intiface-central wine64Packages.waylandFull ft2-clone + luanti ]; hardware = { diff --git a/host/Rory-ovh/services/containers/draupnir-ansible/services/draupnir.nix b/host/Rory-ovh/services/containers/draupnir-ansible/services/draupnir.nix
index ef76500..93ba3f9 100644 --- a/host/Rory-ovh/services/containers/draupnir-ansible/services/draupnir.nix +++ b/host/Rory-ovh/services/containers/draupnir-ansible/services/draupnir.nix
@@ -22,7 +22,13 @@ protections = { wordlist = { - words = [ "https://postimg.cc/" ]; + words = [ + "https://postimg.cc/" + "lolitaheaven.onrender.com" + "heavenlychat-px42.onrender.com" + "heavenlydev.onrender.com" + "Adolf_hipster007" + ]; minutesBeforeTrusting = 0; }; }; diff --git a/host/Rory-ovh/services/containers/draupnir-belibre/container.nix b/host/Rory-ovh/services/containers/draupnir-belibre/container.nix
index e19fb68..09f5606 100644 --- a/host/Rory-ovh/services/containers/draupnir-belibre/container.nix +++ b/host/Rory-ovh/services/containers/draupnir-belibre/container.nix
@@ -19,10 +19,10 @@ ]; }; hostAddress = "192.168.100.1"; - localAddress = "192.168.100.18"; + localAddress = "192.168.100.23"; bindMounts."draupnir-access-token" = { - hostPath = "/data/secrets/draupnir-fedora-access-token"; + hostPath = "/data/secrets/draupnir-belibre-access-token"; mountPoint = "/etc/draupnir-access-token"; isReadOnly = true; }; diff --git a/host/Rory-ovh/services/containers/draupnir-belibre/services/draupnir.nix b/host/Rory-ovh/services/containers/draupnir-belibre/services/draupnir.nix
index 0b74984..917958c 100644 --- a/host/Rory-ovh/services/containers/draupnir-belibre/services/draupnir.nix +++ b/host/Rory-ovh/services/containers/draupnir-belibre/services/draupnir.nix
@@ -8,7 +8,7 @@ settings = { homeserverUrl = "https://matrix.rory.gay"; - managementRoom = "#draupnir-fedora-mgmt:rory.gay"; + managementRoom = "#draupnir-belibre-mgmt:rory.gay"; recordIgnoredInvites = true; # We want to be aware of invites autojoinOnlyIfManager = true; # ... but we don't want the bot to be invited to eg. Matrix HQ... automaticallyRedactForReasons = [ "*" ]; # Always autoredact @@ -22,7 +22,43 @@ protections = { wordlist = { - words = [ "https://postimg.cc/" ]; + words = [ + # The Obvious + "tranny" + "faggot" + "ywnbaw" + "nigger" + # abuse domains + "https://postimg.cc/" + "https://s.binance.com" + # Dec 2025 IRC spam + "irc.hardchats.com" + "white power" + "white pride" + "trannies" + "jews did 9/11" + "zigger" + "|| || <===" + "usurping jews" + "fag hoe" + "neo-freenode" + "thegreatbritishbookshop.co.uk" + "\"israel\"" + "die alone" + "kike" + "irc.tr0ll.us" + "irc.gangste.rs" + "irc.wepump.in" + "death to" + "irc.hackclub.com" + "irc.supernets.org" + "[supernets]" + # Known abuse + "lolitaheaven.onrender.com" + "heavenlychat-px42.onrender.com" + "heavenlydev.onrender.com" + "Adolf_hipster007" + ]; minutesBeforeTrusting = 0; }; }; diff --git a/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix b/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix
index 0b74984..9a6d219 100644 --- a/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix +++ b/host/Rory-ovh/services/containers/draupnir-fedora/services/draupnir.nix
@@ -22,7 +22,13 @@ protections = { wordlist = { - words = [ "https://postimg.cc/" ]; + words = [ + "https://postimg.cc/" + "lolitaheaven.onrender.com" + "heavenlychat-px42.onrender.com" + "heavenlydev.onrender.com" + "Adolf_hipster007" + ]; minutesBeforeTrusting = 0; }; }; diff --git a/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix b/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix
index 228bf69..7b8321b 100644 --- a/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix +++ b/host/Rory-ovh/services/containers/spacebar/services/spacebar.nix
@@ -190,6 +190,7 @@ in #LOG_REQUESTS = "-200,204,304"; LOG_REQUESTS = "-"; LOG_VALIDATION_ERRORS = true; + LOG_API_ERRORS = true; #DB_LOGGING=true; #LOG_GATEWAY_TRACES=true; #LOG_PROTO_UPDATES=true; diff --git a/host/Rory-ovh/services/matrix/draupnir.nix b/host/Rory-ovh/services/matrix/draupnir.nix
index 54f5d23..9a7c292 100755 --- a/host/Rory-ovh/services/matrix/draupnir.nix +++ b/host/Rory-ovh/services/matrix/draupnir.nix
@@ -1,4 +1,4 @@ -{ pkgs, draupnir, ... }: +{ config, lib, pkgs, draupnir, ... }: { services.draupnir = { @@ -60,10 +60,49 @@ "irc.hackclub.com" "irc.supernets.org" "[supernets]" + "lolitaheaven.onrender.com" + "heavenlychat-px42.onrender.com" + "heavenlydev.onrender.com" + "Adolf_hipster007" ]; minutesBeforeTrusting = 0; }; }; }; }; + + systemd.services."draupnir" = { + serviceConfig = let + cfg = config.services.draupnir; + format = pkgs.formats.yaml { }; + configFile = format.generate "draupnir.yaml" cfg.settings; + in { + ExecStart = lib.mkForce ( + toString ( + [ + (lib.getExe cfg.package) + "--draupnir-config" + configFile + ] + ++ lib.optionals (cfg.secrets.accessToken != null) [ + "--access-token-path" + "%d/access_token" + ] + ++ lib.optionals (cfg.secrets.pantalaimon.password != null) [ + "--pantalaimon-password-path" + "%d/pantalaimon_password" + ] + ++ lib.optionals (cfg.secrets.web.synapseHTTPAntispam.authorization != null) [ + "--http-antispam-authorization-path" + "%d/http_antispam_authorization" + ] + ++ [ + "--max-old-space-size=32768" + "--max-semi-space-size=256" + "--prof" + ] + ) + ); + }; + }; }