diff --git a/machines/_base.nix b/machines/_base.nix index 240bf59..d26a887 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -7,8 +7,6 @@ ... }: { imports = [ - (modulesPath + "/virtualisation/proxmox-lxc.nix") - # for the secrets inputs.agenix.nixosModules.default @@ -25,6 +23,8 @@ ../applications/restic.nix ]; + boot.kernelPackages = pkgs.linuxPackages_latest; + nix = { settings = { # flakes are essensial diff --git a/machines/agentjones.nix b/machines/agentjones.nix index f3f9e2e..b2d14f4 100644 --- a/machines/agentjones.nix +++ b/machines/agentjones.nix @@ -16,11 +16,9 @@ Notes: Used to have Agent Smith as a partner but it died (Ironically) # name of the server, sets teh hostname and record for it name = "agentjones"; ip_pub = "193.1.99.72"; - ip_priv = "193.1.99.125"; hostname = "${name}.skynet.ie"; in { imports = [ - ./hardware/_base.nix ./hardware/RM001.nix ]; @@ -55,13 +53,13 @@ in { }; # keep the wired usb connection alive (front panel) - networking.interfaces.enp0s29u1u5u2.useDHCP = true; + # networking.interfaces.enp0s29u1u5u2.useDHCP = true; networking.hostName = name; # this has to be defined for any physical servers # vms are defined by teh vm host networking.interfaces = { - eno2 = { + eno1 = { ipv4.addresses = [ { address = ip_pub; @@ -69,16 +67,6 @@ in { } ]; }; - eno1 = { - #useDHCP = false; - ipv4.addresses = [ - { - # internal address - address = ip_priv; - prefixLength = 26; - } - ]; - }; }; # this server is teh firewall @@ -97,7 +85,7 @@ in { }; }; - enable = true; + enable = false; # gonna have to get all the forward = builtins.concatLists ( diff --git a/machines/cadie.nix b/machines/cadie.nix index e7c045b..7c7ad69 100644 --- a/machines/cadie.nix +++ b/machines/cadie.nix @@ -20,6 +20,7 @@ Notes: hostname = "${name}.skynet.ie"; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ../applications/nextcloud.nix ]; diff --git a/machines/earth.nix b/machines/earth.nix index e8c2f9d..ba2be39 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -20,6 +20,7 @@ Notes: hostname = "${name}.skynet.ie"; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ../applications/skynet.ie.nix ]; diff --git a/machines/galatea.nix b/machines/galatea.nix index f82217c..8b77265 100644 --- a/machines/galatea.nix +++ b/machines/galatea.nix @@ -21,6 +21,7 @@ Notes: hostname = "${name}.skynet.ie"; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ../applications/ulfm.nix ]; diff --git a/machines/gir.nix b/machines/gir.nix index ebb17e2..d46d153 100644 --- a/machines/gir.nix +++ b/machines/gir.nix @@ -21,6 +21,7 @@ Notes: #hostname = ip_pub; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ../applications/email.nix ]; diff --git a/machines/glados.nix b/machines/glados.nix index d1e7d2c..33db5f6 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -21,6 +21,7 @@ Notes: Each user has roughly 20gb os storage hostname = "${name}.skynet.ie"; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ../applications/gitlab.nix ]; diff --git a/machines/hardware/RM001.nix b/machines/hardware/RM001.nix index 6e756a7..0ecf097 100644 --- a/machines/hardware/RM001.nix +++ b/machines/hardware/RM001.nix @@ -10,6 +10,7 @@ }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") + ./_base.nix ]; boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod"]; @@ -18,17 +19,17 @@ boot.extraModulePackages = []; fileSystems."/" = { - device = "/dev/disk/by-uuid/9b177e4a-726e-4e68-a0e1-53837a8cae2e"; + device = "/dev/disk/by-uuid/f7b9d648-735f-44b7-b439-6af601b234a7"; fsType = "ext4"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/41AD-70AF"; + device = "/dev/disk/by-uuid/679E-C352"; fsType = "vfat"; }; swapDevices = [ - {device = "/dev/disk/by-uuid/c5990c64-077f-45b1-96b5-44ec93e6651f";} + {device = "/dev/disk/by-uuid/b1da9f57-1ed0-4f10-a6c0-6536a0017b2a";} ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -38,7 +39,6 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.eno1.useDHCP = lib.mkDefault true; # networking.interfaces.eno2.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s29u1u1.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/machines/hardware/RM002.nix b/machines/hardware/RM002.nix index 01336bd..d7e8e0d 100644 --- a/machines/hardware/RM002.nix +++ b/machines/hardware/RM002.nix @@ -10,6 +10,7 @@ }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") + ./_base.nix ]; boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; diff --git a/machines/hardware/RM007.nix b/machines/hardware/RM007.nix index 3888e34..18e8b35 100644 --- a/machines/hardware/RM007.nix +++ b/machines/hardware/RM007.nix @@ -10,6 +10,7 @@ }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") + ./_base.nix ]; boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod"]; diff --git a/machines/hardware/_base.nix b/machines/hardware/_base.nix index ae8b77f..02a9a68 100644 --- a/machines/hardware/_base.nix +++ b/machines/hardware/_base.nix @@ -11,6 +11,10 @@ with lib; let has_ip = interface: (length config.networking.interfaces."${interface}".ipv4.addresses) != 0; in { config = { + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + assertions = [ { assertion = lists.any has_ip interfaces; diff --git a/machines/kitt.nix b/machines/kitt.nix index 5891571..ab313de 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -21,6 +21,7 @@ Notes: #hostname = ip_pub; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ../applications/ldap/server.nix ../applications/discord.nix ../applications/bitwarden/vaultwarden.nix diff --git a/machines/neuromancer.nix b/machines/neuromancer.nix index abfc3e5..1e4d271 100644 --- a/machines/neuromancer.nix +++ b/machines/neuromancer.nix @@ -20,7 +20,6 @@ Notes: hostname = "${name}.skynet.ie"; in { imports = [ - ./hardware/_base.nix ./hardware/RM007.nix ]; diff --git a/machines/optimus.nix b/machines/optimus.nix index 095c55c..9e80047 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -21,6 +21,7 @@ Notes: hostname = "${name}.skynet.ie"; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ../applications/games.nix ]; diff --git a/machines/skynet.nix b/machines/skynet.nix index 250f069..4992f5d 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -22,6 +22,7 @@ Notes: Does not host offical sites hostname = "${name}.skynet.ie"; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ../applications/skynet_users.nix ]; diff --git a/machines/vendetta.nix b/machines/vendetta.nix index eb594ab..f54fab9 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -20,7 +20,6 @@ Notes: Using the server that used to be called Earth hostname = "${name}.skynet.ie"; in { imports = [ - ./hardware/_base.nix ./hardware/RM002.nix ]; diff --git a/machines/vigil.nix b/machines/vigil.nix index e3c811c..d1f8f1c 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -19,6 +19,7 @@ Notes: hostname = "${name}.skynet.ie"; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ]; deployment = { diff --git a/machines/wheatly.nix b/machines/wheatly.nix index 02eabce..210db08 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -20,6 +20,7 @@ Notes: hostname = "${name}.skynet.ie"; in { imports = [ + (modulesPath + "/virtualisation/proxmox-lxc.nix") ../applications/gitlab_runner.nix ]; diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 0800d91..c32b42e 100644 Binary files a/secrets/backup/restic.age and b/secrets/backup/restic.age differ diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index 17c903f..1885e43 100644 --- a/secrets/backup/restic_pw.age +++ b/secrets/backup/restic_pw.age @@ -1,16 +1,15 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA X73TNuqAEEP70YrpJ22gajHtIcup+AUyjnHnEPRkrQc -fOiScgObTZKv0WsmPS+BbsTvuJZcXTioGP56kABM7cU --> ssh-ed25519 4PzZog CNQuXi6jm6Xmh4QzBJ8+O0Jbnsh8UrEWMOsmRtXFshY -WTuhPe0dEnykE66GvnAEbguRvG0abdUodhHL0yPrWCE --> ssh-ed25519 5Nd93w 1DhYU2M+FSjtmIK0bWp1aS90HIpTzYo9WpW/B5c+njo -WHz3TOuDjv9MfjNV7VevwFR20lBxVWJJ6M96+wy9egs --> ssh-ed25519 q8eJgg a81sexKwFWkEFTP/X75A37ANOGq3YofVKdounD/wSVQ -lsIjaP1MU7v+P0PLcFwtX30KXOlyySAnmVPG+78xaYs --> ssh-ed25519 mKj+iw 5yD+zJi/C+BFNVGnio0EymgnuRHi7u9OTL/vuAT7vig -JWNvvMZdDv3iWYHP/DknhYyqUeUfKIxy9VVlIN8ExlI --> r`jNR?-grease h/n>KE, s{B|NV6h !' ; -YCNm7rDXLor2unHnuvnjg+BfiJMjK6/+7wHQaDBRdtrvKin+Dx9MW091g5cpq1Xw -H8OGvNrFms+7xaYJ2Ie6LjW8 ---- 3yRzK3Q9BlO/hxhid+T5qFHbnVc0Ohg5SbAdyYXGNfw -c5줄t`fGqh L~L߹wUCw(gh, yctQ[pa1Cܷ`0ɓim \ No newline at end of file +-> ssh-ed25519 V1pwNA UrkmIZL5xSVVJ//LVygMsIVjv9axkiGHQzYXytxB2Vk +EEI30Szqp55TKBUpHGhE0kG9MpiJbRYUatwjxI4uarY +-> ssh-ed25519 4PzZog z4kmVHgbEbTAUK2n77K4kPep1JVKeOjJ/DsBbllwC2I +u4Cj9g0oAD08yeAh86koOQpAOnkGwDTtgQDf/i6uvSc +-> ssh-ed25519 5Nd93w YKp+mkt1IJCd3upuXavalOs06kADebHehoI4EyGSJ3U +lsDewdeBFBGj+SyJCp6Eay6Ym1oervcy4k4YqWdvwbc +-> ssh-ed25519 q8eJgg Zp0cx2VSagfaLWVNcThlrZDSWh00t9x7NWFNH22f3Cw +Beddl2WC2hX0iUNRlYPx0tYofpVLuvpA+1QKeXL+Ln4 +-> ssh-ed25519 mKj+iw ZekINCT2/NuDprvxYC2NYaMJpy7eWFxKjz6DxX1+1U4 +OvwkA2dpaJWek5JwUNr+QFJDVTWzNaTVE8cILb+lcFk +-> `^ZVU'F]-grease +bX85oZ2Oeg +--- +N65SzHOFt+I2pi7AqBvcIqKrpwK929+E3BFJeIvuTI +oxĥ8!"{YC: fnmogCz?'0iܞ(o-a U#s烏Qޛ0}B|Z \ No newline at end of file diff --git a/secrets/bitwarden/api.age b/secrets/bitwarden/api.age index e92f6e7..8d4755f 100644 Binary files a/secrets/bitwarden/api.age and b/secrets/bitwarden/api.age differ diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 3d5ac2a..ea53a6b 100644 --- a/secrets/bitwarden/details.age +++ b/secrets/bitwarden/details.age @@ -1,16 +1,16 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA d3Xy8iQxiSb8gV8NRqBAxBm0g5V1INUAeHJDFdAqe3o -Uaw/Q/BjZabCWBoKJmSICiUn8/OWXjj+/sx0BZKxWj8 --> ssh-ed25519 4PzZog qxpYb+zz05nntFRA8k0ZwWSmpvOA8gnf8AaBuy5xyhQ -ssOtug0RBDkPbSEC4Acs/UNelfLmkLLH2pEm0geAuVE --> ssh-ed25519 5Nd93w iXfwzbDeUuFqwXPztMdaBXnfXY7W8sQXmcxEtMqkPzM -t88pMxJ09RtrNEd1tn8N5iUh2mnaHwzb3dD6xlt8jRw --> ssh-ed25519 q8eJgg 4NAejBkAf4tZEsq6YsWJiOTq3wBBkDHB3Z1CFG8LeSk -yIicVNLUkaHs9RzaEFFn0SVqR5QiKNJZShehiEfvTh4 --> ssh-ed25519 IzAMqA orpGqetn3ND76DC2QejaGnAlPDlV43l7/GdJB47SFQA -U0Bm9/VgoY6/dwIdqZpOY5rQc5j/TBlKzRS8rndyxu4 --> _-grease yOwV[T R\ b>SI aVM^#_X -VfqPBdd5CK3GXPcBxXzbq9ak7qYJrnrxU7O7pKmfavJJ55dsmXKvEI7NE2tgASsr -Gxc1ttbQ4310R2CN0IM7xvMRLQsg/MnA2WGiwO52OYkHJXZ/i9F8ro4sq8q5cJE ---- T8NUXH3YnnAIycabcEi8uFUfnDuvdgy3COrUoPPA+lQ -QýPE*NcY޳ Y튰nKBaz^fJyhW!u|dDq'}6^5wSk1%Nsmwi+|Dpϔqr!1ə ?H$(f͐gKn{a93tl܂GbrでbMY(`y&,'{= \ No newline at end of file +-> ssh-ed25519 V1pwNA q4Ueso2aibg13pKFkdrI6GFwjsX6s2G/+U2jXAMcxEE +Y++4/bN7b0IX/ArWW78UEUIEqbLwFc10cAbpiyAOePU +-> ssh-ed25519 4PzZog ucFdPmkbTRvY78ablrQGVdvsSM9Fy2KvzB9bWwV1M1E +kJLFAJsC688+ApYxU6GmZQHyb3wk/d4fB8tuTT2H/rs +-> ssh-ed25519 5Nd93w uyM1GZJM0evpOxUoJ33RvuA9bhrlwMGWaWBXKt80Kko +9qHOuiBL4kLy7SpN7HmWmwikV4jC2KeabEwVPCDmddY +-> ssh-ed25519 q8eJgg m/js9ey/+C7HCxJC/rmPCTQGq0ORzoKiHoOyUAKv1gI +YNjioxNWoAz7pYJFlfkfIahbvW/XcPrY563w2hJbjD8 +-> ssh-ed25519 IzAMqA gns3Bpt9Tz3LmUuH/Z+jGHU9m1eJyXsZzY6MtWxo5FE +2OT9ca/t+rX2WT+8VfxQeCD2+rXmFtP5CIxox400/7g +-> L]bL276-grease 5cn4XU: & +Ge/lAHiOkIcdU6WgYBosz58Xwd+HUtz4Di2KAir88dRprRZCl9m9z4m6kRhPjdYk +N6dru5r+GA+y+e4AKMaN+FBa +--- UuWKkXjxdS6jDoVh+rEXqXoYXtKYJps30Na7+VZQZ6I +.zz:T-Iܲa/1S`*~@QVyw yy.;)a,%|9`*/}M4D31o7o]5rZ1cWHJugSG'n  2.&0;ԟl@N*WFX1jv.s7T;î \ No newline at end of file diff --git a/secrets/discord/ldap.age b/secrets/discord/ldap.age index 3e8660a..4e0140b 100644 --- a/secrets/discord/ldap.age +++ b/secrets/discord/ldap.age @@ -1,22 +1,24 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA xlTIjQff+BPeL2UECA0yAYFTMSTbVqnA+PTN7lAfE2k -nUCQZQUV8ydkbgoZhHVo1i9E49OgWh6JD9U+YDbO7O8 --> ssh-ed25519 4PzZog 2wGhFQ34UkF8KxzpRvTafpIqNaUChm0QuVUGoii3aHY -4GdDi96Ol5yKxTekD6Alzrw9vRBOuHERFN+MGAXALnw --> ssh-ed25519 5Nd93w LTQPqKIfVAkcRY/n4FBcttl5bWRvLKV35kVkCgfXhSE -fERddZA6QKOyFSogRSXu1meHUFabIFgjg6lSVa/OR6Y --> ssh-ed25519 q8eJgg ZaJw7DqjgIruLUteut2QbFp5MtdocR8WirUGf1BwW0g -LvSo3XGI+9Hw04gaXyOs6q3jZKgrUuaRm7ZZna0JOJs --> ssh-ed25519 IzAMqA kJYHO1B+S3L6IchTv8L6gEJdRS1lWTAP8omc09/13CE -IFHuqpK6sT+2r36gJj2+CLUJjEREvoxjfYZQyj1qtgU --> ssh-ed25519 uZzB3g +ev9Qgf0Ufxn0CsvWiC2rKTqMGNlI2getrSbwad+d20 -8Bu5NadOaZcIXCYL9WDZwiknPPGXCDLFoQK78SUXJEM --> ssh-ed25519 Hb0ipQ 7323aHKs1i4Ufh9EePnIbsDPGHhkjVABTPQ/ga7uQ1o -ONx1LDHESTKNTLU9yryAjW+q/kBF/SjJuRuM/JV9mvo --> ssh-ed25519 IzAMqA dPtQz4ppUCY+G7ygtY4WU8tGeiuagEIuw/mzp1MNuWk -sctOGA3tn+FdW1bBSenFj6Y9h0Dr9kAUFbJqbyUoDOs --> qYvB[-grease ;_85Y; -8BUJy4ivlkl4m5BUsynI1olVCA ---- akpO+kJAeIqo7YhXMFsw609zk/oJN6PjTZYrjCdqMh4 -6U6@NMJ2GÖMFJiJ&^1Y>2voD+'׭: :p6bՀt# -r!sgfYPnQ$s8f<{m9* \ No newline at end of file +-> ssh-ed25519 V1pwNA /ywPcnDv9MT97QtCtZyDgwiu6PFqQ9/syRsVKJljO38 +aqgfEOOFxZ9sAZa3ma6XX1NIHHfUgExflj/wh7kMln4 +-> ssh-ed25519 4PzZog diUivY//pDD5pO5DAOF/hpVFiy+UEPt//T2wSsb2hFs +8KilVjO5UOGqXzJ3DJl0Squh1KCBDLQz6Fp4P/+senI +-> ssh-ed25519 5Nd93w udWVov8JSaEni4WuLH4Cj+/+gDNrtVKL6FjMcR61wzs +K//4c4SpggpOITVg5QY0vzaedQJrnfKJwaWvZyknlI0 +-> ssh-ed25519 q8eJgg qHWmUmpkVNF3SZEnAgBU7EgF+q9eErnz+MldT0wwigk +MsEPbJof97Kz4emhNkZG34RZvJeC4Ky9OkncElfHumI +-> ssh-ed25519 IzAMqA +NXHK30PSHgyl0gPbO/AJTdveI2qcSbRSaJnWlPBHAE +iBpfcn9BHFXgoc70cQA5u9KqW2IdAveyXM9rV79J4c0 +-> ssh-ed25519 uZzB3g wD73v6MdXeeLGhOZBQcSi6/VLVtGBRk4UOwaFAJtsVo +KvGoCprdnry2gHwzTS+BfQ09DWawKKoA1q9QO0Z/n7k +-> ssh-ed25519 Hb0ipQ hqMralxzBAmwwVz2t5ySnk3skhxUGr+NXjbm+ZSKVVw +/MMOfDiQtiwoAD5DJxQnjpkpi/3C3DLXTSwUOkF6CSc +-> ssh-ed25519 IzAMqA yNEnWzWwhJSNsT1C8aFIiOYb7xXlKLcNL2mhisWhhmQ +9C5Iny+zpFc8wzYO5EUltD0nkHpJl6ADvDkexgHQGtE +-> inJ-grease ( $$4~2,{ gN +FFbbRchWkZG7edNSxcs5qfJzAc8u8jhjOTBttADj6gqrfbsvU+md/ttHShow4MBd +IttH8tmx/5VOiSdUHDpdlTabog +--- 0z74mEAmADrq8gy7L7n/JPWCE7HdBsXDBGkOHvlpHe4 +tTX^sϷ(D?'l7t^e1|},RⰟ0Xl%(d*;D{7eIHR; x$zCɶk= 83҆ej]1CÃΟ +%J +lSt.lU]SR $֩ \ No newline at end of file diff --git a/secrets/discord/token.age b/secrets/discord/token.age index 0360dfb..3ef3ca7 100644 Binary files a/secrets/discord/token.age and b/secrets/discord/token.age differ diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index 9a01683..351251e 100644 --- a/secrets/dns_certs.secret.age +++ b/secrets/dns_certs.secret.age @@ -1,32 +1,32 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA nG0AHa3H4vfygTEQoAHfY30CjOpmj1ffPOpCAJ3vmBk -Qut0rBmGYPJHaOdTWCOy5JML4NKCtlUIqTXmcXKSxZU --> ssh-ed25519 4PzZog I5+i0lkVwbzG+sqGrCReuHzsU19tLi1SboqPPBD4HGY -HrdFS0QOc3lOVe7iYxsm7akT768+SaligBdmCNKGL5s --> ssh-ed25519 5Nd93w 0R8EQvW2DzhhMETLXuC0I/b3QG4FdAojUhgCjl1veBw -BpPZd7qhqZK6ERYKGnu5NMf1nPZqM9uc3T6rQaCPuwU --> ssh-ed25519 q8eJgg Fb8LVHNk+tqj6mI/TwfcgJndt7/L9CZoZTTGX4hCuXg -/BnYhtGfNVtrICX1Sfa2o7h8RDZm6fmL6dyNUIMLXEU --> ssh-ed25519 XSrA6w LcEe4qfLXeWbPBHhYYhMuah0r11aviPO0tmaV/P/TzA -UlQ62w7iYlAkV2JDZdmBHuOFt/emPOb26l45RPSNKXg --> ssh-ed25519 DVzSig nK/TTAP8vl4Q6ltd96AJoFV78jXKqEagNrrA/SDC6l4 -1lYKWXfP+LAxPRObq1VWvZqdJZi7DijikoGzjT8JEEA --> ssh-ed25519 SqDBmA T9qOjPSZr44EdtGjz88G+qNwIwEkgKNtJm9lfMBu5Hk -7+qN1Uf/a1Bs9o5YyO6OsaC+F+odkfFnn9MYo04QxPU --> ssh-ed25519 UE6fcQ +VsGwaWJ0QuBfSBOO9fHpYXXVJin5c/1F+ZkGN5jC0U -cUo39xNopF6goxCoSRI3C1eg6ynSOX1HmbTqH6JCzjo --> ssh-ed25519 IzAMqA pcJ8a1soioxd/aX9a8SCyz+4ClrtUyDkQTNxUTH75U8 -iA2vSv0WroLZoRbjvwa5MxgPfFY8HTToCpLzOs1QdcQ --> ssh-ed25519 uZzB3g srDszrjqCUdPlZR1junFInBTCcV6Pf8YZjdfI/jlymQ -ZqWkiWNCdj14yXibvJZt5kzplJYxV+FTYNSW2g/+IfM --> ssh-ed25519 Hb0ipQ 7yV7BevtuILbQGDdzhb6xbA+1HE6gHIGBy/J5dqo2mo -vhZQ6RMeK7nmWVyrO2b5BRWA5UCLKKl/cmM8Qf4ywDo --> ssh-ed25519 uZzB3g uZqAB7XXJORAr4SqRrtELzgsj8F5/7ZHqYjQBHtuWB0 -hN/6oT92j0jn6TWGaPQ2GHNE57YaoYQrHz6XocOmSZw --> ssh-ed25519 YFaxCg uiXU3Fi8w3hzZ4tQD0xcijmHDXK1wIFXKwCTKlZtOHo -eW+0I5AFhJ/lutzftUFNjwBXbIT026qQh1iB2MyK0bo --> 3-;D;-grease >yx2 }|M -iHbl8gyGfyh72AKP2rKtBbtsOWD3zfJtXUvZmgtDr1hR++RRWE6hDOOKPeWrlTfc -r80zbGItMrUtbaV6BT5g9+Ji6w ---- 0GOtCNG/Yxp0gVi4t1R7nDT6ZdAvyM9XTWmsaLYwbOo -%r!wfmmeUpN1%oj,05x̃vU_F 'NM>GD ssh-ed25519 V1pwNA ZLBiDtR05iPx4valDRINj4rpMf7LHJE4rQvdE3JLFws +CFA3cMAAVxyPoPFohTH0IktUUzUMS75z1O5Ow7Hlbpk +-> ssh-ed25519 4PzZog OP0vtHH9L0mHY/ZxZurUmkBXNPfJMmqMC6mGq1yimFY +/FvT81dkPahxKnLd6NxmHOfS5GPcDi13Vx/hABocQkg +-> ssh-ed25519 5Nd93w Iwugqe9M50VCuvU0jGhameZlF8HLP2Krj8zXtGaGFnk +/RmG+W3FKVRk3rl7uFb0Lfb/pNyYM555N7Ayxv5t2X0 +-> ssh-ed25519 q8eJgg HvQZs85/nCMRrd8NjhI/3zZdzbnWkWFmZPjWBQ9LlwU +XP7B6pW3Zn/zzKb5RT3i8dMHUegM9zBRbt2EcMsoS3s +-> ssh-ed25519 XSrA6w sBC8C1fI+LRAp4PkrkwS4WkCmB24Lf0xkOTm3lFEwVw +nxepx6uOP0F4NnhWb9O4BMa6084oGPUV/u3BZmUnJFo +-> ssh-ed25519 DVzSig Hhq4J27OqtTUOF5EVxBYA2V5O6vTkqJS3uV+Nqxz2XE +FZGav4tw9/5TNQ6ILIAcy40dW1FVo0n9yRhdFm7Rozk +-> ssh-ed25519 SqDBmA Ke968FnJnRQBEbgZK3smFnbp/R9542HeQbW2ltT6HUc +0I3ZF2xdCF3//aXb+YmkNHmTMaFQFHRBQ4+UJl/msjA +-> ssh-ed25519 UE6fcQ PtVzyDlkmbwRwV0UMIQ0OM0e6BIqIsW8Ap7Vqiz8hmM +OFzxt4ynYCgBlltbDDiHZO3BOljgmXQGbPUV3Z+13cg +-> ssh-ed25519 IzAMqA m/7gUbADOIjcjVo3DSmaJXg35EmWHouzeFDcwOOhnUg +cSSr41Q49LP7bx3D3WxPd2gUAyJB5hq/dlP7M8dMKgY +-> ssh-ed25519 uZzB3g vjqV4e12hH55SCmhQjdfunDz24dIcABFyqVuATfxaC4 +jbp1laLOFLOVgtsQyGm7fvDfC/V68CjPHwe/ECQw3tc +-> ssh-ed25519 Hb0ipQ MU32Wb0m43Z0Vgs6tz10Y8HoqOH7kawoDxeNw4b8UB8 +gT2LjTU5ACx4nlW/wRVRy//h/Pd64VZs5+Dx3LbxDI4 +-> ssh-ed25519 uZzB3g 8ueMqQj3wMXI5huSNKLm78KnlqL4kjJ0PFKaGC1HUxE +pE9/rhz8bz5bwNeg2yZXinha5DXzr52BeKkocFz/wGo +-> ssh-ed25519 YFaxCg s4LJOWg5s+qZoSFViHug5uXKUP0Ehhy+zwjFzdWXXRs +GvuUJUsC0PqbexmF6t11kwLq7WrzhCv42r/mZZ9Bhfo +-> 3JfnOS-grease e-k 6,OtIN !g(TvN +wNYhfMNPtw +--- TngVRrso2T8d3nay1ViRStSZ9cWPw/cMCZEH+HvteRo +#j-3>oPq.x\ -N$FbZBC3!>KѰ8R@8˾([Jj/;⣺NB~GE eE2)` ' :e"M'J┆[ANs'%kJ(kp?_$ݎ;7~v$o]'ωhb + \ No newline at end of file diff --git a/secrets/dns_dnskeys.conf.age b/secrets/dns_dnskeys.conf.age index 845c331..b83d637 100644 Binary files a/secrets/dns_dnskeys.conf.age and b/secrets/dns_dnskeys.conf.age differ diff --git a/secrets/email/details.age b/secrets/email/details.age index 3c73aa0..9421a3f 100644 Binary files a/secrets/email/details.age and b/secrets/email/details.age differ diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index 182cfd7..1320e80 100644 Binary files a/secrets/gitlab/db_pw.age and b/secrets/gitlab/db_pw.age differ diff --git a/secrets/gitlab/ldap_pw.age b/secrets/gitlab/ldap_pw.age index 4b1d10e..a1db3dd 100644 Binary files a/secrets/gitlab/ldap_pw.age and b/secrets/gitlab/ldap_pw.age differ diff --git a/secrets/gitlab/pw.age b/secrets/gitlab/pw.age index 9052082..5bc243f 100644 Binary files a/secrets/gitlab/pw.age and b/secrets/gitlab/pw.age differ diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index dd74df0..e36bd38 100644 --- a/secrets/gitlab/runners/runner01.age +++ b/secrets/gitlab/runners/runner01.age @@ -1,16 +1,16 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA Q+aZXp6fZFE68OnX/F6tNP+PH1WQGcNEmu8J7R7zt0Q -EYbVEeYOtNSBg9TmmWZAJkkjx12hh4tx4xK2NpNww+M --> ssh-ed25519 4PzZog l+fryFp0/bPZ2P8l+S/mPfX1YoSFJOYE3lqTjidiL2A -SLzRQCp6OzSoQcwC4Y/U1kDn/qlaZLTZklN+jqu4axw --> ssh-ed25519 5Nd93w BKBzISKkHxdZwIYYGEcEobc6G6RXlDST0hIFlMtGPyY -wp4FP71dh/lfD+Oa2jd+g5DKRZ0GEGjO6wwZUCKk0eg --> ssh-ed25519 q8eJgg 99JO2pDB4sw7d3LrZbr5dfe98xFHbdnu+FGZkU4wsV4 -IL+DNllbXOfM0KpbtBGvlYZo8v4zGYKuNGr8JUqhG8Q --> ssh-ed25519 yvS9bw UiVck8CTj4QspzWgj3oHT+J3iLVPv3J+2Kk1Rt8F2T8 -SFtVEiB7q0KXWPArxheEOORfqJWNNovLaRApa+AqxiQ --> ]0q7t-grease h#+R # -qgAS/6JHtK8TjOwWd9QC2ZA/ptbnKwnJyBdn19wqbOM5G+eIrme7F6Y2mZuGL4Mn -N3s ---- bGLa8VtcsZZnTWfh5nfkRTHHgPKWhrOK42PY/gfTpXI -tpY(::-yBA YiҔ$g6tK"[Syܩ~pe !ɞ9*mde̯CRw)g]97n-"n!+;9yC \ No newline at end of file +-> ssh-ed25519 V1pwNA EHlg17AzeBr3+X9U/43BhY8CeLKO1iV9hDfkJYjZ1AU +ZL7y/JAP3uDqQebxvCSagTfkHeA2Nt48gDl4mpxD9RM +-> ssh-ed25519 4PzZog Qn4RRo6tvMzGtNJm+14kJlI45LZm9ELinKYbzqQo8wM +cpPFG1H6FnKm31du6HzOiNUTYGS1jhSce+DlcGJvPSw +-> ssh-ed25519 5Nd93w bkSMYuu8lGE/5wkLYYC3tUNmjz40YQs4lBK+XTH1ljs +wmDJ9YywboBGKhEJLI39lV7rthL5PrtKt2oYoZec30g +-> ssh-ed25519 q8eJgg nv5HLBPzmKzQ7S1heWZ/MKL+2ld7h5xX0ib6zwI74mw +CPrtsZvE5Lc9D2UQ1Um1MWf8kDH2dFUHB8t3TE7QpDs +-> ssh-ed25519 yvS9bw xStD/2bXqHHyYkrlmslW3/F/YRFA1ZvFAUJLOkOidBU +4T6zJR4NoN5F6DWKWLCFw27iOCZAi2xXNzaTs4EVYFg +-> `+rr(-grease 5%=!{ 56y@" +t3EQrEvbW0U9X81vIfmSDgavBImzJX966w +--- zufFrtdon0GkwCQKSR/8EOgcHVj54PE9ZwouYnLq1gE +8+eFJPz^|8WYߠ'ITP5.]: +xSRg}!d]$Ԯf l#O=P 1gBT4#9 \ No newline at end of file diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index f26fdae..843cdfd 100644 Binary files a/secrets/gitlab/runners/runner02.age and b/secrets/gitlab/runners/runner02.age differ diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index 57021de..2a2bd55 100644 Binary files a/secrets/gitlab/secrets_db.age and b/secrets/gitlab/secrets_db.age differ diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index 385f514..657413b 100644 Binary files a/secrets/gitlab/secrets_jws.age and b/secrets/gitlab/secrets_jws.age differ diff --git a/secrets/gitlab/secrets_otp.age b/secrets/gitlab/secrets_otp.age index 502d3aa..6d6dc6d 100644 Binary files a/secrets/gitlab/secrets_otp.age and b/secrets/gitlab/secrets_otp.age differ diff --git a/secrets/gitlab/secrets_secret.age b/secrets/gitlab/secrets_secret.age index 41494e7..f75ff3d 100644 Binary files a/secrets/gitlab/secrets_secret.age and b/secrets/gitlab/secrets_secret.age differ diff --git a/secrets/ldap/details.age b/secrets/ldap/details.age index 8dc6419..7aadbe1 100644 Binary files a/secrets/ldap/details.age and b/secrets/ldap/details.age differ diff --git a/secrets/ldap/pw.age b/secrets/ldap/pw.age index 947132d..60fc130 100644 Binary files a/secrets/ldap/pw.age and b/secrets/ldap/pw.age differ diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index 27aec7c..37f26c5 100644 Binary files a/secrets/nextcloud/pw.age and b/secrets/nextcloud/pw.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index cc13d63..e25ba05 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -11,7 +11,7 @@ let thenobrainer ]; - agentjones = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAbqYQrdVHmGgXZJoMWWRDGVEIj775Zrf4PxB5hoth+k root@agentjones"; + agentjones = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDHOxA3uYcqS5gTrG1hS8XXwehzQYAI2I4iULtU8cXft root@agentjones"; vendetta = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINxTrUPZPqttuxfmmP8BTACTAkv1yY1nfzEd64hN4LT+ root@vendetta"; vigil = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDsz1bjNAThqwF48dKIJGOECsCKHTj/Gn5Gh9XyzoSO root@vigil"; galatea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3Mke5YtaMkLvXJxJ3y7YAIEBesoJk3qJyJsnoLUWgW root@galatea"; diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index 6db5779..965f5b5 100644 Binary files a/secrets/stream_ulfm.age and b/secrets/stream_ulfm.age differ diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index 4274de6..5422757 100644 Binary files a/secrets/wolves/details.age and b/secrets/wolves/details.age differ