From 8c6441a941bc2aca8e7ae676e1f004eb4e369125 Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Sun, 28 Jul 2024 12:46:10 +0200
Subject: [PATCH] new VPS

---
 newinfra/nix/hive.nix                      | 12 ++++++++++++
 newinfra/nix/modules/dns/noratrieb.dev.nix |  2 ++
 newinfra/nix/secrets/minio_env_file.age    | 11 ++++++-----
 newinfra/nix/secrets/secrets.nix           |  3 ++-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix
index d8aac22..b1cd0e9 100644
--- a/newinfra/nix/hive.nix
+++ b/newinfra/nix/hive.nix
@@ -123,6 +123,18 @@
 
     age.secrets.docker_registry_password.file = ./secrets/docker_registry_password.age;
 
+    networking.hostName = name;
+    deployment.tags = [ "ingress" "eu" "apps" ];
+    system.stateVersion = "23.11";
+  };
+  vps3 = { name, nodes, modulesPath, ... }: {
+    imports = [
+      (modulesPath + "/profiles/qemu-guest.nix")
+      ./modules/contabo
+      ./modules/ingress
+      ./modules/minio
+    ];
+
     networking.hostName = name;
     deployment.tags = [ "ingress" "eu" "apps" ];
     system.stateVersion = "23.11";
diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix
index f2b1581..3601dd1 100644
--- a/newinfra/nix/modules/dns/noratrieb.dev.nix
+++ b/newinfra/nix/modules/dns/noratrieb.dev.nix
@@ -11,6 +11,7 @@ let
       dns2 = normalHost "128.140.3.7" "2a01:4f8:c2c:d616::";
 
       vps1 = normalHost "161.97.165.1" null;
+      vps3 = normalHost "134.255.181.139" null;
     in
     # vps1 contains root noratrieb.dev
     vps1 // {
@@ -39,6 +40,7 @@ let
           inherit dns1;
           inherit dns2;
           inherit vps1;
+          inherit vps3;
         };
       };
     };
diff --git a/newinfra/nix/secrets/minio_env_file.age b/newinfra/nix/secrets/minio_env_file.age
index 5f3f794..2136ffa 100644
--- a/newinfra/nix/secrets/minio_env_file.age
+++ b/newinfra/nix/secrets/minio_env_file.age
@@ -1,6 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 cVCt6g aURyPoqVOIH8dVpkyn+mb8rxwv1hw2hazAgLj/qDxzM
-bOkR3mOiK9pA8CQxTGLpd52UyrTWvZ4cPz4m/khin5w
---- ALJ+6QKzH/CrCZ8FzdeWFRFZKFt6YOF0bKpLri7yCpU
-��NB�a��Jya�������8��[���Շ鶼��Cɳ7X����MB��C!���c�pm_wD���z�oย��H�'��i�	�
-�����i8��ɛ:t/=`O��kZұ
\ No newline at end of file
+-> ssh-ed25519 cVCt6g 4Q/z0+zqH3m8VaD7A7PJyFUx0JUBV1pf5PQGOlmxp0M
+O/R9ophtwIKD5xD5gyorWd4g705IO9cukIfM+7ibOuI
+-> ssh-ed25519 JZjRLQ 6VSR982/8P7s0eBUrPFdjMRJe3fpKtsW9CGmm+MAsAc
+/emWV8UZOLR9iLiquBOKORupaKs1Xou+rifetyGe3YE
+--- XOM5G09L1ARNe9+SMoiObzVWFLQbuFpfOM7iExyZTVo
+`MzhT�>5|?�`����C$y�+��eE7})��n��C��`�B�2"&J1�Ek�?)�N/]���[*��*uC��ctW��1��:]�|��p����Z�X
\ No newline at end of file
diff --git a/newinfra/nix/secrets/secrets.nix b/newinfra/nix/secrets/secrets.nix
index 239962f..2f0d43d 100644
--- a/newinfra/nix/secrets/secrets.nix
+++ b/newinfra/nix/secrets/secrets.nix
@@ -1,9 +1,10 @@
 let
   vps1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOixcV3SGAWRCMYYn+ybioFSBhpfkYzSU1nX+g6e5jI5";
+  vps3 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDM2e3h6Z2HcKDP6mkBip/5M41AegUdSdNa9mc8LrXpR";
 in
 {
   "widetom_bot_token.age".publicKeys = [ vps1 ];
   "widetom_config_toml.age".publicKeys = [ vps1 ];
   "docker_registry_password.age".publicKeys = [ vps1 ];
-  "minio_env_file.age".publicKeys = [ vps1 ];
+  "minio_env_file.age".publicKeys = [ vps1 vps3 ];
 }