From 47bdada7e8584a23fda32f0fad49fe4d66f6c72e Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Sat, 19 Aug 2023 09:26:38 -0700
Subject: [PATCH] Disable autoupgrade

---
 nixos/common/autoupgrade.nix              |  2 +-
 nixos/roles/matrix-homeserver/synapse.nix | 25 +++++++++++++++++++++++
 nixos/roles/minecraft-server.nix          | 11 ++++++----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/nixos/common/autoupgrade.nix b/nixos/common/autoupgrade.nix
index 41d58fcf..14c363fe 100644
--- a/nixos/common/autoupgrade.nix
+++ b/nixos/common/autoupgrade.nix
@@ -1,6 +1,6 @@
 {config, ...}: {
   system.autoUpgrade = {
-    enable = true;
+    enable = false;
     flake = "github:kittywitch/infrastructure#${config.networking.hostName}";
   };
 }
diff --git a/nixos/roles/matrix-homeserver/synapse.nix b/nixos/roles/matrix-homeserver/synapse.nix
index c6116b0b..a93a26e4 100644
--- a/nixos/roles/matrix-homeserver/synapse.nix
+++ b/nixos/roles/matrix-homeserver/synapse.nix
@@ -23,6 +23,31 @@ in {
       registration_shared_secret = "!!MATRIX_SHARED_REGISTRATION_SECRET!!";
       allow_guest_access = true;
       suppress_key_server_warning = true;
+      log_config = pkgs.writeText "nya.yaml" ''
+        version: 1
+        formatters:
+          precise:
+            format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+        filters:
+          context:
+            (): synapse.util.logcontext.LoggingContextFilter
+            request: ""
+        handlers:
+          console:
+            class: logging.StreamHandler
+            formatter: precise
+            filters: [context]
+        loggers:
+          synapse:
+            level: WARNING
+          synapse.storage.SQL:
+            # beware: increasing this to DEBUG will make synapse log sensitive
+            # information such as access tokens.
+            level: WARNING
+        root:
+          level: WARNING
+          handlers: [console]
+      '';
       listeners = [
         {
           port = 8009;
diff --git a/nixos/roles/minecraft-server.nix b/nixos/roles/minecraft-server.nix
index 3b9bf5b6..978f4220 100644
--- a/nixos/roles/minecraft-server.nix
+++ b/nixos/roles/minecraft-server.nix
@@ -4,16 +4,19 @@
   lib,
   ...
 }: {
+  networking.firewall = {
+    allowedTCPPorts = [25565 8123];
+  };
   services.minecraft-servers = {
-    enable = true;
-    eula = true;
+    enable = false;
+    eula = false;
     environmentFile = pkgs.writeText "aaaa" ''
       QUILT_LOADER_DISABLE_BEACON=true
     '';
     servers.arkamew = let
       modpack = inputs.minecraft.legacyPackages.${pkgs.system}.fetchPackwizModpack {
         url = "https://github.com/kittywitch/arka-modpack/raw/main/pack.toml";
-        packHash = "sha256-4Fa8xB0CpeANzjRg7B0RUEHepJvnVGFfgTPq7NLa8mM=";
+        packHash = "sha256-b198Q2eCf8xN3X6SJEIbFZB/PxC4vYcjiQSoeVjWyEk=";
         manifestHash = "sha256:17lg9syx1ddggyq2h8a92frg4lpr2xc7ryh30bniv9dhymr0vc23";
         side = "both";
       };
@@ -21,7 +24,7 @@
       quiltVersion = modpack.manifest.versions.quilt;
       serverVersion = lib.replaceStrings ["."] ["_"] "quilt-${mcVersion}-${quiltVersion}";
     in {
-      enable = true;
+      enable = false;
       autoStart = true;
       openFirewall = true;
       whitelist = {