From 797ae2cfec8b81c7cfb25cfe9b81f330c30a1022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Sun, 25 Jul 2021 19:19:29 +0100
Subject: [PATCH 1/3] voor-kia: Update dimension mods

---
 pkgs/minecraft/voor-kia/mods.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/minecraft/voor-kia/mods.json b/pkgs/minecraft/voor-kia/mods.json
index 76bfd99..db5efa7 100644
--- a/pkgs/minecraft/voor-kia/mods.json
+++ b/pkgs/minecraft/voor-kia/mods.json
@@ -457,15 +457,15 @@
   },
   {
     "project": "the-bumblezone-forge",
-    "id": "3201726",
-    "filename": "the_bumblezone-1.16.5-2.2.14.jar",
-    "sha256": "b1f478dcd2fffdf8d52dd4ea4760c170bf9b50ef2b6b5ede97b0921ad9602e90"
+    "id": "3389654",
+    "filename": "the_bumblezone-1.16.5-2.4.9-forge.jar",
+    "sha256": "51b2b5860ee391df2ea76c235c6614b34225312ebadaca4893c8ff16b0e9242a"
   },
   {
     "project": "the-undergarden",
-    "id": "3176785",
-    "filename": "The_Undergarden-1.16.5-0.4.5.jar",
-    "sha256": "a48b6d6a6075ecb3ddaff7877796a996d38f94810f8eb2ae1d0f0612d9827808"
+    "id": "3361666",
+    "filename": "The_Undergarden-1.16.5-0.5.4.jar",
+    "sha256": "b596836a5c1d50cf1c65c50ea728b0e295965cf9a4091a8eb1caac517aad5c50"
   },
   {
     "project": "towers-of-the-wild",

From 7c24369cb9ffb89797c2246d2b9ef4db1481e537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Sun, 25 Jul 2021 19:31:46 +0100
Subject: [PATCH 2/3] voor-kia: Update forge minecraft version

---
 pkgs/minecraft/forge-server.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/minecraft/forge-server.nix b/pkgs/minecraft/forge-server.nix
index a3cbb1f..d91c5e6 100644
--- a/pkgs/minecraft/forge-server.nix
+++ b/pkgs/minecraft/forge-server.nix
@@ -3,12 +3,12 @@
 
 let
   name = "forge-server";
-  version = "1.16.5-36.1.1";
+  version = "1.16.5-36.1.65";
   mirror = "https://files.minecraftforge.net/maven/net/minecraftforge/forge";
   src = fetchurl {
     url = "${mirror}/${version}/forge-${version}-installer.jar";
     # Forge doesn't seem to like newer shas
-    sha1 = "78e5bd0b19f05136bb25bf3c5be9b64a1d0e850e";
+    sha1 = "9aedcd5e64bfc12483b9c51bc4cf18e551ad054a";
   };
 
   unpackCmd = "mkdir -p src; cp $curSrc src/forge-${version}-installer.jar";
@@ -40,7 +40,7 @@ let
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "CzzQhnN+DBgOJAa9MlNhT338VcDLy2ULMTMCecmxMQ4=";
+    outputHash = "lHAuKgwD2gzTb+n3pLgpXsDGYSLF/EYlGy0TfCoU5uQ=";
   };
 
 in stdenv.mkDerivation rec {

From 05b6738c85ac9c7e3aca110a1df207916f0a50b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Thu, 10 Jun 2021 23:39:42 +0100
Subject: [PATCH 3/3] postgres: Set auth method to "reject"

This will reject connections from anywhere except 127.0.0.1, i.e., the
pod's network namespace.

This makes password authentication properly obsolete, instead of just
hiding the password (but still never authenticating with it), but
required a change upstream:
https://github.com/docker-library/postgres/pull/859
---
 configuration/services/gitea.nix     | 1 +
 configuration/services/nextcloud.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configuration/services/gitea.nix b/configuration/services/gitea.nix
index 2258566..4c34146 100644
--- a/configuration/services/gitea.nix
+++ b/configuration/services/gitea.nix
@@ -42,6 +42,7 @@
         environment = {
           POSTGRES_DB = "gitea";
           POSTGRES_USER = "gitea";
+          POSTGRES_HOST_AUTH_METHOD = "reject";
         };
         volumes = [ "gitea-db-data:/var/lib/postgresql/data" ];
       };
diff --git a/configuration/services/nextcloud.nix b/configuration/services/nextcloud.nix
index 4b74ac7..e8731f8 100644
--- a/configuration/services/nextcloud.nix
+++ b/configuration/services/nextcloud.nix
@@ -43,6 +43,7 @@
         environment = {
           POSTGRES_DB = "nextcloud";
           POSTGRES_USER = "nextcloud";
+          POSTGRES_HOST_AUTH_METHOD = "reject";
         };
         volumes = [ "nextcloud-db-data:/var/lib/postgresql/data" ];
       };