diff --git a/flake.nix b/flake.nix index 85bab21..2fd30a1 100644 --- a/flake.nix +++ b/flake.nix @@ -54,21 +54,17 @@ }; outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, nixvim, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. - let # Variables that can be used in the config files - user = "kabbone"; - userdmz = "diablo"; - userserver = "mephisto"; - location = "$HOME/.setup"; - in # Use above variables in ... - { - nixosConfigurations = ( # NixOS configurations - import ./hosts { # Imports ./hosts/default.nix - inherit (nixpkgs) lib; - inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable user userdmz userserver location agenix jovian-nixos microvm impermanence lanzaboote nixvim; # Also inherit home-manager so it does not need to be defined here. - nix.allowedUsers = [ "@wheel" ]; - security.sudo.execWheelOnly = true; - } - ); + rec { + nixosConfigurations = ( # NixOS configurations + import ./hosts { # Imports ./hosts/default.nix + inherit (nixpkgs) lib; + inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote nixvim; # Also inherit home-manager so it does not need to be defined here. + nix.allowedUsers = [ "@wheel" ]; + security.sudo.execWheelOnly = true; + } + ); + hydraJobs."steamdeck" = nixosConfigurations.steamdeck.config.system.build.toplevel; }; + } diff --git a/hosts/default.nix b/hosts/default.nix index fe09d47..910b24b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -11,9 +11,14 @@ # └─ ./home.nix # -{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, user, userdmz, userserver, location, agenix, jovian-nixos, microvm, impermanence, lanzaboote, nixvim, ... }: +{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, nixvim, ... }: let + user = "kabbone"; + userdmz = "diablo"; + userserver = "mephisto"; + location = "$HOME/.setup"; + system = "x86_64-linux"; # System architecture pkgs = import nixpkgs { diff --git a/hosts/dmz/default.nix b/hosts/dmz/default.nix index 05b7039..cd2fe7c 100644 --- a/hosts/dmz/default.nix +++ b/hosts/dmz/default.nix @@ -24,8 +24,7 @@ [(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix [(import ../../modules/wm/virtualisation/docker.nix)] ++ # Docker [(import ../../modules/wm/virtualisation/kvm-intel.nix)] ++ # Docker - (import ../../modules/services/dmz) ++ # Server Services - (import ../../modules/hardware); # Hardware devices + (import ../../modules/services/dmz); # Server Services boot = { # Boot options kernelPackages = pkgs.linuxPackages_latest; diff --git a/modules/services/dmz/hydra.nix b/modules/services/dmz/hydra.nix index aa921dc..cb849e6 100644 --- a/modules/services/dmz/hydra.nix +++ b/modules/services/dmz/hydra.nix @@ -7,5 +7,27 @@ notificationSender = "hydra@localhost"; useSubstitutes = true; }; + + networking.firewall = { + enable = true; + #allowedUDPPorts = [ ]; + allowedTCPPorts = [ 3000 ]; + }; + + nix = { + settings.trusted-users = [ + "hydra" + ]; + + extraOptions = '' + secret-key-files = ${config.age.secrets."keys/nixsign".path} + ''; + }; + + age.secrets."keys/nixsign" = { + file = ../../../secrets/keys/nixservepriv.age; + owner = "hydra"; + }; + } diff --git a/secrets/keys/nixremote.age b/secrets/keys/nixremote.age index a5106af..d4beb86 100644 Binary files a/secrets/keys/nixremote.age and b/secrets/keys/nixremote.age differ diff --git a/secrets/keys/nixservepriv.age b/secrets/keys/nixservepriv.age index b243147..018f9be 100644 Binary files a/secrets/keys/nixservepriv.age and b/secrets/keys/nixservepriv.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 83ca441..2c751b2 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -20,7 +20,7 @@ let server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDwN8p78OncPIRUfV64PLHOem4LtlQ3opOJwLEYqdGVx"; server2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPm3epi3v+yuskxQZgmPdkVDET8IGeYA6LbTCqPWqkz+"; - dmz = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmivVLbkJJ1anwQ8CeNT7rv0Qxinp1LIQIjVWZpnIE5"; + dmz = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5OMVTx1IkzFvDgDRwiv+ruYTCBlJ+D1hx+BS8Roah"; hades = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgnWyQUUa+vcHAKx6edbTgqW8ph+MCiS6fUwYjYcS+o"; nasbak = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdoxslkKn3ouadPOHmDN7e5AtoJmnllnUmhl1j9qfzz"; jupiter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDBQr9/TIeAd25h0gfOPjoHs6JMeye4V04LuFufbe1S/"; @@ -58,6 +58,7 @@ let ]; buildServer = [ hades + dmz ]; in { diff --git a/secrets/services/coturn/static-auth.age b/secrets/services/coturn/static-auth.age index a3f8340..01407ee 100644 --- a/secrets/services/coturn/static-auth.age +++ b/secrets/services/coturn/static-auth.age @@ -1,23 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 neExcQ FMwvw6TmjR3KbTH9UgtlHGmC3ZM9s1+g2Lb2B4oSJWI -l9TBPRZpSM1Wky9J+uNaKSYVI65MlLxTU7Kh2uC9Ijs --> ssh-ed25519 WiIaQQ J3tqbCwliMu7Hp/diV45LB0z2EWpLAwivGxxNQm1O28 -O7EDQl7x7htiIyVOQfSWHQbIxVWEnDJ/rOwE7Jey6go +-> ssh-ed25519 neExcQ zATy64IKJIShLHyKMY1sbnZszJRSeI29TPS4ev5iTUU +2z31wYDfKiNvB1q59+9kDrf/Nz0F+7yrmubZDbvnKHY +-> ssh-ed25519 WiIaQQ 9EF6O0TiYpuUJdA4/G+bNz4KK1AgxP0dzlNYt7CYOmM +aYePtiAih/bctCvYqxCe4yNb1NQiyFhT+ES5N3siiyE -> ssh-rsa VtjGpQ -BE/OvVUprp821b/gLSDol0R0P65wwtYHKulHt2Y1Ik02w/A/GCJbVX1hAbxkhRnR -5em/iKrbG5J3kabFgV/2VLB21yzcrdip0Cvzbgn0HsZ7I0PS80W+Nz054cdH6QV/ -A+iveZxwS0x5VWI1//mmPp6YGeEOw89r/KyIZ7As8gTmVzQoVEeaqUsP9A2/+VuG -J6gbE6vCb5jxJ7OrLZbtBjfJhac3g7KHfy9QcLNRDSR+r0YVYOElUSyYdz3DUbJp -vCkNdm2s00wzAobyK5KLx4k9UB+1kJRPjP52Uxt4A+pEjIviH1vTnHzQb+vL4LuR -qR6spF4vXHj14eGva51+8bxuUBj3kx9zS4XFTLug9B9xe8XgiPJDq109/fzCLkyr -CZwmvAIUbghLzVw5ub4It+79GKxYXH9GjkWmVQX1J1a6ls7Fvy8pW90Fh2N5M+wk -FTQru+OuwfllWUZaUWpE1mUzu65CZ84Kfg5slm3oY/y8E6UEmHiwdpCD1Y7mxGwl -hlQAhOzXyiNDHtWdvRaA66if7+heTvkEoKD5/owUJ0tJTMyvZgah0r2OGbKWluTv -+w6DMlKQFtnnW437t3QZFEWmz6r8UV53CzVIjcOv6Nd8za20RKofmOCeyVJ5GRNk -weL94rH3Mv5YKh3/mJGj4fsYgka3uRO+rV6G7fNZcfQ --> piv-p256 grR75w AnCspIRjswTZ8aEXA15AQiJDKmUiHQhvKg4Rhfre3kCu -Prp1jHRXIdTXapLZgjWwjy091uc37kCIvGstSOxmNbI --> piv-p256 RQguQQ AxfKlFTYgyFzB7sxct0s3/QcoVs1AFwSysZTTBhJjwZz -GYuHnz8yk5TsY/y2oibHnkFh+Ah956ZiSKXzbT5Fu+A ---- ++NTK2N0Od5wJsDHGXUg5AbVPNRl2siwehTeRHNMkec -TrIؓb4 t!5dC/w[mA/\]N!~岆rim`Y ۦoHnZ'(KJ~0G9 \ No newline at end of file +nohDiJNrLOH/errhtfFLk37ZLJrNI1zSzmJVpvimRw/2BwXxRkIF1VBiraxyKq2h +2rNRaUVnPDr4dlXJ4QA1mENHKUgfxqQuU3/+jeB+u3rFYCwDUDveXTCCkea1YNbr +OUzIewWGl3foSH9c0Plz1I4mltPLKTd0I58vqjwqfgykb1hcbWnKq/HV6J5Xt4sG +pZrp81PcLNSvhHDA3yMJRmStI9LdA9J80DxZUNYTO0PQRvoIHMQm2esSfY3hyTQf +HsKXp6/s2U2yrpNxpz/lAEUnU7nYyXydVRHfSFSoCQ2zZlrq6/r3zxRTHytmku1X +3afVCVtWCUppT3xTsXbuAOp4U5QAbvHTK7nhAoVCqRqbM04YUI1/NPiO71Z5sCv1 +hqgjvj5QcG9bVK/s2j1/3G01Cu7nYAXm+CaIP7czVmzO1oEaxc1JIi+T8+qJdkyq +eUBDZr6pz7gMQjiqS5GL1u05Sg8u6sqgAevwK23RlEfI06y39ITOGSrUmGDKhoJS +UtAGC5X3mt38wnvGgdpv615lS60zEj0qalRaO/4qp89oXvPMRFEtj9E8bkh3FhdW +eBWrlUiBsVj1MV4X7zpF5d6pTQ3G3BflqScAtBAQCuRT+v5Uht6mvqMGm2Bm67xG +hSJUbQIguc/lPjivKLktus/VvzfHI+OFstnp/1nEgJI +-> piv-p256 grR75w A0UNAMZPvN+CVfAkfATkng21JIMY2WdEHW84FuelpETA +icFQQONKw8ocG1wbPDNTee6mN8p/zK8iw46pNHCmKfE +-> piv-p256 RQguQQ A6T6gAICcwfwIOalY482dZFo/z5LayDvSA0fU4lSMXNf +R9t1LmZATRTjb6HXOqFRm9bH0Yw/2VtCl3fvgT/B3hk +--- Vkw97f1ikkBGxKCqROgZNEHHsQU3aWbXRkVwnZYV6eg +zm[hKriC)Q۷jwhz/0pλ9ߝ%TPeMW{qd\M#:k $aHJj #3$ \ No newline at end of file diff --git a/secrets/services/gitea/databasePassword.age b/secrets/services/gitea/databasePassword.age index dc7bc14..d9eddf1 100644 Binary files a/secrets/services/gitea/databasePassword.age and b/secrets/services/gitea/databasePassword.age differ diff --git a/secrets/services/gitea/homerunner-token.age b/secrets/services/gitea/homerunner-token.age index 87c5eb2..67eb4c3 100644 Binary files a/secrets/services/gitea/homerunner-token.age and b/secrets/services/gitea/homerunner-token.age differ diff --git a/secrets/services/gitea/mailerPassword.age b/secrets/services/gitea/mailerPassword.age index bb87e05..a051c34 100644 --- a/secrets/services/gitea/mailerPassword.age +++ b/secrets/services/gitea/mailerPassword.age @@ -1,23 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 neExcQ Qx3NuIC3HnyhLAPB6NGLlO8073iIEXQ3VpVDvsPsLVk -9Cz7AXaP/EorKrdLxMfaWJJsCIv5u6upJIaNbLiDleA --> ssh-ed25519 WiIaQQ AS+i8m6vO83lj5vZ1lr+FiM1SO1v7BU6OWertpdTXSU -LIitIW7F/8idoKvgHmirFp1V9RlObyqOueDVIdBdRM0 +-> ssh-ed25519 neExcQ VK6Rv+qIQyE/uui3sIxwHv6AudYA1Wi73pyy+7kZzAQ +5jX71FB1EbjmYsKO2SkcBT+qFg8pWZh95BVfSnhHioI +-> ssh-ed25519 WiIaQQ QWgxfYOT262jN8qOGY3lFX/hRQIbdVzzlgBxbMS0Uic +CndHYqkQ6emzOE9zmxjak6az/ZHPQEwdlZ66t3xlYcI -> ssh-rsa VtjGpQ -FdINMHPfPVgkQk0A5g6uDRQmZxI0h74QkJSdYUtHRfbqBP0R3f4TrqbtO4n6E7pR -5NYLkqyZND7ApC10hoQ2UJF22Ja06ZvWhhM7Zsl0X3u/58NhgXsXWy92I2sniBa4 -DF6T3AD4bQOF4Px2A/+lnA++NIWHdroqghojWOAZazvLFaFa6HtIdrTiMb2bojuU -qxepekbRwJBEm9/5bKHZlEmwx3rJsYxrNKEkxPrBvNdPbnwgxrvhOXxeQJghyGGw -vnCRHKDbqvRIWfkmftRjNQMHUSMitDJHUOPsG9z5KBr4M7n7B1bV5ozsLsVyUUmE -6vBvrOPz9+RiE9H61PlAvPFMmKBTQgRf8+mjbU0RGxScqLcUoHCud2x3O+WqlLoP -TMQtye8ayRPgG3PbwP4pO3olcA9ANEdd2Jfo+HG4izbJxdCTbOMfEFTJIEfyGMIo -lo0Hh0EIijFAVfyAH6G/Rv1KggpINr8fTxbWz8i1PXTqzBsjfrqbHWWRrE/VJSYI -x9bjSHeWCOs+IlZ2YEB8dshJe5smrTnKpFYrj3kvLHOiC1jKUJdDZooQex4nkXpW -mMKIOb/VF6/QM3NkmJKLdnMJenIKL1Vqbrv/Lqu1/FaINqRsIGTXCsQs+JjxrcfX -zxpzs7Bk2eV/BaiJxJ7Cjfx1gO37GpL0kzCMuN1xnWs --> piv-p256 grR75w Azu36XfRZ2Evj79zCs8RA5lwbMe2Je0oBI5JM+3MC/cO -p8nO/p2M3pvEevZLLItNDSz64Ju8yBA2GPBnTWMN25I --> piv-p256 RQguQQ Av9ILPK7bsPNqgudLMq88MNSWrB+xrBVfxX3bjVCquvj -0iwRR9htchLUk88RRooXsP0H39FfybCPMQC8AMxgu/0 ---- puq9s7iYi1A0v+7Qhsqo05Yfxtg5kHJK66RM1TDLtNM -![u_(*0Ŵ8"Fsn"T-ww' 4sd_! \ No newline at end of file +eMKw7oWGIDmGptq793W4aJJgOpNhEf0ZjipbuGuUKfb6WKRlxc9i3ruhaWkTLXVx +efvyb9GxAtMp+jdL3RpyLP/T7SgoyGBPw63tlzCF8lL3Dyke5ahMpZHQEESYE8zS +/3brXwPlqmy/FbWj2/FbtNqvdfGrwCSr5nz0T+Pt9YgKFv1sw2R0M/FkTJzT4nLH +krK6UfXybEAbBzLzOpjKslP9HgPD8FhLDP7oB10Lvl1gSc1ueSId+U9Q+182Vyu9 +r6iSVrbwxUpvx51a7i8W50FcE3wyMhH14u/g+Jurip8QJwuvDPFNACLfPptU6npW +ZZuEY/BOLruyjTwmuN+2k1qcfHDj9D8VNyNsBVG+jT8iCCv5PDbJVhpna1pCTn7T +Y5JSAvMvDUHV+XiKMmjbPVCiDbunzK5YVUfBqQIUovxgVhbnTjzzdBvnHbTP6nlk +JI9hZeRgHWllq5PnpOFMAAkZclUbMK/u+L6cnGQHmH1T9HrIwEnhXzH+ItLoQ8BG +CVhRllSGqkaT3Tn+d9qdvjJMuhzzYi2Ucb329tqv0rc2k28ooqo5PsPzdLTxB/Qj +f6vA55c9zPz/3GOkmSxvlnCphAtu2LKNLithjryhNZauQgjYiBPLVhk/2YNBCL3Z +8p89IlZYM35eglVmbjeQIUBW6zqjYypAIPpLeVTNSaA +-> piv-p256 grR75w A5OhROi/MtvU1un5l16VF8VRw0s4aboaj9nHhH3slGXw +NTh8IIXAMSMIw0fG6PlqnUj7bJCUtEDj9tIeHdFtRIY +-> piv-p256 RQguQQ A5wTuyxjwAfv/cayi+W9eIqopghCUXw1so+/k68UuP6u +kRhPizvslbAgcbplTJqCdtkN1srtf+zOm5JkmQPF8UY +--- PPX5yRfkFLr6msSev39e8hfwtw6YZF3GwWlb/ngg8zI +c&3/ĶUR'˶Q/%I&* @ʲ?+HQ( \ No newline at end of file diff --git a/secrets/services/gitea/serverrunner-token.age b/secrets/services/gitea/serverrunner-token.age index a832f39..9e09176 100644 Binary files a/secrets/services/gitea/serverrunner-token.age and b/secrets/services/gitea/serverrunner-token.age differ diff --git a/secrets/services/matrix/mautrix-signal.age b/secrets/services/matrix/mautrix-signal.age index feb3002..fcd7096 100644 Binary files a/secrets/services/matrix/mautrix-signal.age and b/secrets/services/matrix/mautrix-signal.age differ diff --git a/secrets/services/matrix/mautrix-telegram.age b/secrets/services/matrix/mautrix-telegram.age index 2515aec..4bb7e9d 100644 Binary files a/secrets/services/matrix/mautrix-telegram.age and b/secrets/services/matrix/mautrix-telegram.age differ diff --git a/secrets/services/matrix/mautrix-whatsapp.age b/secrets/services/matrix/mautrix-whatsapp.age index bfb50b1..280ac8b 100644 Binary files a/secrets/services/matrix/mautrix-whatsapp.age and b/secrets/services/matrix/mautrix-whatsapp.age differ diff --git a/secrets/services/matrix/signal-registration.age b/secrets/services/matrix/signal-registration.age index eb5c30f..5452a50 100644 Binary files a/secrets/services/matrix/signal-registration.age and b/secrets/services/matrix/signal-registration.age differ diff --git a/secrets/services/matrix/synapse.age b/secrets/services/matrix/synapse.age index b2394b0..61c32ae 100644 Binary files a/secrets/services/matrix/synapse.age and b/secrets/services/matrix/synapse.age differ diff --git a/secrets/services/matrix/telegram-registration.age b/secrets/services/matrix/telegram-registration.age index 1a032f7..e237bbe 100644 Binary files a/secrets/services/matrix/telegram-registration.age and b/secrets/services/matrix/telegram-registration.age differ diff --git a/secrets/services/matrix/whatsapp-registration.age b/secrets/services/matrix/whatsapp-registration.age index 7a1821a..6c7ae18 100644 Binary files a/secrets/services/matrix/whatsapp-registration.age and b/secrets/services/matrix/whatsapp-registration.age differ diff --git a/secrets/services/nextcloud/adminpassFile.age b/secrets/services/nextcloud/adminpassFile.age index 1ce3142..e3ecea7 100644 --- a/secrets/services/nextcloud/adminpassFile.age +++ b/secrets/services/nextcloud/adminpassFile.age @@ -1,23 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 neExcQ 8cKmhu5xTxTuvVbBhVZM2W2qzRQRVX9BSojcK6YgCys -kwfUlvEPLVbaq/rjQAu4s2NhGbxFfdEeLyU1eUH2gF0 --> ssh-ed25519 WiIaQQ TvRNnifxg4OPDvwvuUIdJgwrpj8KegqfjVEB/in9UEw -U0iqVaHbZS/SvCH4UAzjJQ9nPiHv779v6s5PwjTxf5k +-> ssh-ed25519 neExcQ 1Q36CPPU8mtV8pUVRXwLzpI1TKMm7EOxAxJs1kL2qgA +fmyLUaIUCdtYTwGTrqk2hd7eo76yUHQ4Ibw/MkU97+g +-> ssh-ed25519 WiIaQQ IgScMwM3mciTSNeaDqHrIwwoLujX12deQV0JyY5gzlc +x/jigQ9wPlePVThUKDlRPwiExFcNwhTPC/xPyzNmMQ4 -> ssh-rsa VtjGpQ -QZHM+/KssZmfX436QJGBGbhlx36oxCg4jgdbRwa/acI2s6ppawdnFzyWZBhv/Xzk -wYcT9c2ciuy/aEx6uX7fSAiKQbfq0d9KEp+d2xwlpL02656hJ3Jya3U4RApvEFeC -lNjyWgLKuyxYeC20f3/NMg2AnickMicbw4WCzG+HWnVCnxDe2JW+ZbXPsoBg9IbW -BO05nRKB0jonuA5NDvHZ+a/1xf/4qarj9vmwnsoK7jU6TGK2r+iPHuppC/LTgofm -2kXKDP/gpRpIblHr2QukoGeWmXPGeF5PXXCPC5eor1jAhwrBTBY1hL29mhb6mK5M -qvX5wvayHgIHvX73fn2oexepc3QXjazCKSdVSykj/s0N0//0fbtYJe8qIbgfeNen -Lvn9DgsDvQfC83Iikh3r3V4RtmHiD12gA3qxc3tZSQLftbedTbylGnMmCZr2c9w0 -4396ZfUfjXk2Px/XCiy6WBghW62QQ4Q6fGYWBViL1OWCoudNNRCfD72E3jdfj2l2 -cScM+huEDU58dxpHM/6yLT+97Tta7JDpgz2ueMUfKFCUnopKNKBPoaZfFzvi+nCw -vRHVdt5CpN4oJc+mokWCGNt4fK5nyvyO6nDe9cHel91sfS2nCiukf8IKmEDlZQGd -jEMLZjAkuEHwa8Powxi14egunANQPgLSM5EuStDmhlU --> piv-p256 grR75w A2nunTE+4FmZOKWQhinSlizVprH0lX81NKsVEDijzDQK -8+Rdpp1JCxbbxeTVl0WGpQHDlqb5e22zLbBkwBPDYkc --> piv-p256 RQguQQ Ar8nU9oNd+TEfTsdIM4ka/J4IArbeQKfn2W93TYOkajJ -5YnDAocS0lDBrO/M6sNWyn/Vxa1qLiudf2Via9UOUW4 ---- yDdPOHLA10Rxzl+kEyCUx/lmLZaVWucWY1Sj9rdo4hU -B sdGm`),NU@ aPv(rM \ No newline at end of file +cPnxrm6WedO5mpFuV+nJrfjShosy+/b6rAJtezvcRX0AL1TvYcrmgb9KP/twl9Zn +4i0/pHNyuIHyfbaSBCwJ4A0BXRFjiGdILCyFYyhyy9vCQ95qSKwB64flC9x4nHjv +1hSKYPB7AORO94ZlglOWB4nfPSdFVjQ/SC9Cg2Mmu2ogBjWJYmKszj4IsFUz+w2o +eGtAwIv2605PewySUh+R4Hq6h81bTVVdLzjSRCUvI+hPl6hnFkLY/2dzS3gB6xns +HE4XJbCxw1ZA7E/isxR0J/saRbwWl3aakSxvCAr0V2kTge7zFeUpMK4gkJ9zMgp7 +fE1nXnENjB30F0Bl/ezzwjnWr3CHiAdhIVC2/4+aYvv0jiMfSe1xSC1/4NzCz7SP +7wCKcl+r9nhoYFveNEjuWsA0ewHPSrVp841jXehHaHyCYQGW2LypiimJlRR8clVR +rSChmNCXT2zeOqSNSelnepZTmIYOlClPBTVzgCSKlBPZU4Vk3Q6jo66coMv7M34S +dryVB8W1BZff+sxdJ8g/vADEOXwaeQMa3ouDgfRyyUqzmHCcNPvQ07DiurW7AErH +s+WhlQs4SsmE2NsosCPDXBzQltpWeBXSEXj0RvGed1GDKpfSvJYeJpgfQ4HCrLNL +1Vi1Vays+GDchi3AyyCxf92IDBL5s3hvOSzhe6HAEXQ +-> piv-p256 grR75w AvtaPumdCDd8K9L3VZOusZGk9+3ubsIHMXFmr2RH/rZp +xc/G7gnADT1u/Q39tJxAJzwptyrl37UiMJM+4XDBYkQ +-> piv-p256 RQguQQ AvZ5YIW0l6YqEaJx3yxmppPjL//0JqsVyBh0zXIG2t2g +Ur4fiCVBKVhbYhJR0YyNM9/iia9iC651WJg2nOsU9m0 +--- p6VHtNIncJMi5nNMyAg0uQS0fbtwxutG6D59pmOBilA +`]@Ɣ7?ޯPP-i8xZm2Jgzef \ No newline at end of file diff --git a/secrets/services/nextcloud/dbpassFile.age b/secrets/services/nextcloud/dbpassFile.age index 5bde920..a798b50 100644 --- a/secrets/services/nextcloud/dbpassFile.age +++ b/secrets/services/nextcloud/dbpassFile.age @@ -1,23 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 neExcQ VfWt68buOl2UetDKcQWuWRSOeJi4HhQxiZVI4lIfcUU -GTWI83cLyP2Kjd6twRpaWpBq+U/BYcfDJeljQ1CZ1bw --> ssh-ed25519 WiIaQQ nqwbWtevakrHk3sODtw7l40klSb4cIyi4uSsnpcS8QI -PxfriZ8CdPhPTNtjQL3lsyjfjkpBsnmJc0TRNM1pyHM +-> ssh-ed25519 neExcQ 2VMKRZ/JdA/nu2wb81o2Q4kkqPBos0kFfYnqXRdOeW4 +UdZIth6K27V0728kYE8gIp1amr/vK0RRwtipmfQ5unI +-> ssh-ed25519 WiIaQQ spn4qoX25kusHTZcn7bRwI79fSy2NGan2wjs4Xki71I +dxYbGs3khojyr6JxtyatZwJyNw3QHJQCpC7e8m4jZQU -> ssh-rsa VtjGpQ -QRSdhHdAcGlw2c1hxGNmtAp5tPcjQ7CI+v9JkOyOH9W9KF3uOfshrpkz/psFPd+s -6eqQDAwEAgla4pO6FHj/H2PK9KDHY3j2e8BZyvJ8ZsefUsSAYJ92hcD3fdISL+kc -+FMx4Dlm9LSeGGqElbPotyU69t2O/WLF01HqLDVgHrlyTzWvQMhvATA5Yzcj1Izb -0AlA7IOE174E448/Ovo5a2T+DF0w2vLEPruH90Kvs2lui+i8yC3StgBwB6flmSfc -dSR5qO0XCZ8gK/kkdsz2iZonsBCbEugQayN+EoE8vop6YlPW36EtO8IJnVnKmVEX -vy/Rj3dubm5Wsp2hAyeXSXx3ity5fdSJ3TVY7TiPLPlt1yik3Wggtv0DlgZK0AML -x1OJbrZRrzDZKYzxXw69+lOiV5XfVUfk9PXC+IAj3xf/dEz93b6Pief+PbOQg+tz -INDWkL67/Yx6rEf41iLCsQananBV16IeM2SndRyrmT/1OCcLUR/8xqBHfOg/K0kp -lHL7D7/neqRh2E8KOEciHgWFqWT/tV5XpyZVvA8OiYLoVbmLG55q4pexrDfQ9OgT -ZDIL94VjiBDH5BmPfxLhRZP/58EhLSDH3WziIWnv6Y2Y1bAl5qiRU4tEV0RCHqyJ -xEeLcqI5uFwDmmt881zlyAb38oQCGq/YRXhGygwwn18 --> piv-p256 grR75w Ayt9mI1/BJg96jlkLVjf7xhDoklNuoFe3ZeKLYzFqDPO -S3vFS+S4ZVC2O00P5u5GKaLtbabBPUCuuFNFFxcmmUw --> piv-p256 RQguQQ AqsDGN35gXkyWaKSRVATyt1Ap5gzLKiAx+UHwhVXdhhG -YUqypxYBQ2RYbnMclNa8PSLV6atbVRCho4wHUCZegkU ---- Bay62OwVx/Q8Nf5MHRu7VOWzwh1LtkWbxQytL16Y5Zg -n(/GZv ! fs#v5K_tks7Pk \ No newline at end of file +aymF4Ra3PzP3An3Vvej2rFIbFTMJlxtkwIPlmGHrD7PtFVSODdedWG80uT5w5q5c +CpPCl+Ag+jwRmv5ZsVbfnzrYPJvWKyNWgakqDBtkITb9q8mIXiawlsyJ/5MWeodQ +6a/t3FUB/RShh/GJwrE8wPqzjfTPzGuzbTCLytvgwauJKlBFgMp8zRnVJbOONpky +xa9V8kGOK+vc+HpzuX4X4jQh63TwzD/xC3DPVR5NxwKUqjVAeAkkCiJ+6uGK3hKt +Ysm/Imo7s7ULAM+WZFRsnTec/ajGc2Z8jChJLy9tegi5meWIzEge1AXaDM5BY4cE +I17BjwOl1+/wPwWQtofI0WBj3mi/Fbbeqc1hv/NmMRi7Nm1BoEPRzHtUGHgnwMU9 +nlLrjAByMEkjSr1bgCLHjfcA97eCzPnblI7j6k8Hf7kiobMQfQp1bBg9hLGL1vsY +0zVU20r6KPHvb4D0GQ/5r33RNdMHu9embyFQ4bD7UOZggeBRkEQ2cNjBhtP2j8kY +pEo5X+ns2fDaFmj6cqg+WoHGspdNFRRgxOfgo73bppx4IAwb3PWXTLQL/om4k8dq +XlpbfGKq1bFe863PV8IXKe/mRqR375Xlc+r05oRwsLaILYX8TcpMXdsaQFDbu7EG +vq1i9EvLk92/wnJa3GE+41qNYfxGtbMgFY7O6F9Ell8 +-> piv-p256 grR75w A8qjnMe//3tjFQvrV2lMDkWncthrm5Iuk8YxIvhSNfE8 ++BwFVAtF57xjwiDAxLInoJSnEofM2Ya6pMXdBzM4SUo +-> piv-p256 RQguQQ As1VJZg8Ev2C8QueWeV5Vd6ZUWYpqobQQRzf6F+rRjfw +JjK1lhDUDzZqH9xswbqvWYeQ5Mjw4/0IjIMr8ekzjWI +--- 2cbWkzuPlhE8N9NREMjjLtZJ7XXh9dJWvprgUfUilj0 +V/G }]$MzUƼZΤؠYzD ;4=pɗS \ No newline at end of file diff --git a/secrets/services/nextcloud/onlyofficedb.age b/secrets/services/nextcloud/onlyofficedb.age index 5338f03..1561a51 100644 Binary files a/secrets/services/nextcloud/onlyofficedb.age and b/secrets/services/nextcloud/onlyofficedb.age differ diff --git a/secrets/services/nextcloud/onlyofficejwt.age b/secrets/services/nextcloud/onlyofficejwt.age index d787b53..7e375cb 100644 --- a/secrets/services/nextcloud/onlyofficejwt.age +++ b/secrets/services/nextcloud/onlyofficejwt.age @@ -1,23 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 neExcQ 39vMfysEahyydxnqENrwNOZi9yWpZSIWsNQxkMFBQik -bvJK5Gya20UhZ/dWKHAQZ7CPa7v/pISwB90WJejYA5k --> ssh-ed25519 WiIaQQ KZ6RU6kDjHVfy5YwlmjQhH6YBVkJqrRonUl02iYA2m0 -GGsCI2D1tN4lGpsHJph6pq9N8UYdG2mfIY3U9urTR08 +-> ssh-ed25519 neExcQ wQihc4OfCtbCsVMxja89FESZRXUTJDE/hvw+AJr+6R4 +GU7vl0vgRWBIrqt+JEG6pM+qR3dmvsbMluEA9Rkzt08 +-> ssh-ed25519 WiIaQQ XOr2rknILxF4ASnuUwDd2RB0Y3Ejw7/KtVxhH/+WhQk +uTmdcFKgsQzVooHu9G6s0YNxc+bT7cn3a3ACbBuVSmQ -> ssh-rsa VtjGpQ -a0oXJCsFZdtpHuZIASZUp5C96ZP1QU1I3RSpIe59hnnpGLbXZE2qntXBfQ9ojkBW -bgNdxvAcWLaYAiCbe6Bo3S9+Q2svJQlEqIZ59o2H9jh+swSoLfWgi0Blo/56B0GQ -UrltI0ftMhM20TaszHwmVhvo3yODcZpNhjAMNVkQuAov9BSQdgGRgivBnt1FfYYI -f6nqfrE5JVoemk72Ip4jQFVWylK7drEU9W2WlwOsF9zkHOJxdNWiaaHpmnsgOEzA -BIdVqYZTtRElqDKM3j4SdE7hL6i4fIb4QAsfX5XI09eUDQLSRGF2o3lqQ4FVx+hb -YE31vr6yQEObTCbrf7zmKIK5UwgQbMf8+WbCxDdxF7FqTKrg7jVhPtu+n6UsJlzv -CXsJkKYZwyESZ5oNjCyqYkkkQP0JChl886OPFY507/Xn3gl3qj/Sh7FZyUuLZ92X -aTHCJ5AHGwQKFnVO1YLXWDcn0F3NIq90YHJ1NsxNvNXZJmcCyBTMtDJGq3q/6Xqz -qXpVoT/9XHHStrKYvi2lut/PFMC6nciixmiNaVbE5Aok5eNhG8wUTsUVRIr8+O/i -07aQBeg7RJ7lW6oQ4/kdfufQbQHuQNchQzkdvQf3azXCXBTJ/+Z6uQuVg32MVsjq -fRO2BtrWjsAVThpeVAdfQb2b43wmL9HBhivqYaBK1gI --> piv-p256 grR75w A9sg2H7x+75AK9ErkbqMkC06KEDy2Q34seCXCGUguz6H -1TchlkXOzymAT+eDr4bpwugeLQ7gAKRvdYC2xcd9DL8 --> piv-p256 RQguQQ A364N/An/SMqBAp0yrLB0/osdlmz/MgZFG4RB6Os2fLX -V4qtGLbpJrTTFWCfTMcWpuVUiLflDdxXkMqPOtG1R/k ---- O4Xqa0RavBa09l9txN/oIQjAeZIYsur2UsxaSRmhAdE -`Dk/9o Qz#fINJ3Koڵ@>ZzIph \ No newline at end of file +htPqO1lLJ8Jj4sQHjFj54IKbKMvjWozBDXAOP6lrHTx/SGw2ZHvii25gpOQqDmyt +mibl4M07h4O9aoUDp567lxsoTj+3daR6mTueJvijuH0wkR5pnW62zYYmrhzclHQc +RLUeHvjB+ahQVAjkiUWpyAZM3Xq+9b3ZwCXcKTbi6/BMygtHrMWghBHlb1xd8aEb +HcGpmmnV8P54li7DRfxUqMNnj6s+DwaXEfOTFcuLLKdFe+r657GUlc5CvrMXLpRb +n15LEViYevuoCoRQrP48ugoup/NjkgtLmeAVUHiLmMKHjdt46aBUfzOYK9LOt0M6 +Dxq/HbpheGk03xqbrLKbhlSWazZv/d8aReZOwn9DzYgQl7uBrZBP6JQjDYYD4v1W +KIa4JbePdS3fq0W3eQAmrMaQsIILt9Rx+maiQevSqXC4XfwqL7vJv+f2ALzzraWo +a+CRUCBkLQsUk1mUg7gqYwiXE+CKQTq1Ceybqj55bwRurEms0MXcWbU6qFHqOBwj +qSu1oWADGpkPeOVyIuX9MJ3CyBJdwWjrZZ2LCBt4TRyabOCu59ax/Pe3HrDdFiQl +XKzEWPrW3zof60lwrKge1gbLdlo4WNAWaeAXmn92+4jWMGGZmyJqP/EgtcsgmgOY +sKF3YEwAFxyqDO+HmOYfAGWuHcEqIClPihZo/jjIZJ8 +-> piv-p256 grR75w A1IUhaxTkmOz6CRRv3KGmaV4yFrtMx7hsU01K7hgcrja +aQWWXvSRPWH1ox7KO6OBkXkRLhhNS8MlGAsNeC6YkQo +-> piv-p256 RQguQQ A9jxpWPKd3wVyj5/pXJ+/gMI3gyrbSX4Zd6qsn+lnFvb +Xl/OLEjlON/h7PhtxJmiWvXkqQHlb5f04LNhDhwMtU4 +--- z7ivhlW080Adr8qVDEUQ9fpBahUiCuFQ8+xEUivoHxk +r@Ggl6uFcC9mvn'&$ц{Al \ No newline at end of file diff --git a/secrets/services/postgresql/initScript.age b/secrets/services/postgresql/initScript.age index ccf3272..bc587f5 100644 Binary files a/secrets/services/postgresql/initScript.age and b/secrets/services/postgresql/initScript.age differ