diff --git a/nix/hive.nix b/nix/hive.nix index eee6101..92d7186 100644 --- a/nix/hive.nix +++ b/nix/hive.nix @@ -319,8 +319,6 @@ ./modules/postgres ./modules/immich ./modules/tailscale - ./modules/paperless - ./modules/caddy-base ]; system.stateVersion = "25.05"; diff --git a/nix/modules/caddy-base/default.nix b/nix/modules/caddy-base/default.nix deleted file mode 100644 index 6356e88..0000000 --- a/nix/modules/caddy-base/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs, ... }: -let - caddy = pkgs.caddy.withPlugins { - plugins = [ - "github.com/noratrieb-mirrors/certmagic-s3@v1.1.3" - "github.com/sagikazarmark/caddy-fs-s3@v0.10.0" - ]; - hash = "sha256-m5RHlrheqzoGqKQxixq+xTd2hlnCTets9zCT7aFka8g="; - }; -in -{ - environment.systemPackages = [ pkgs.caddy ]; - - networking.firewall.interfaces.wg0.allowedTCPPorts = [ 9010 ]; # metrics - - networking.firewall = { - allowedTCPPorts = [ - 80 # HTTP - 443 # HTTPS - ]; - allowedUDPPorts = [ - 443 # HTTP/3 via QUIC - ]; - }; - - services.caddy = { - enable = true; - package = caddy; - logFormat = '' - output stdout - format json - ''; - globalConfig = '' - auto_https disable_redirects - - servers { - metrics - } - ''; - virtualHosts = { - ":9010" = { - logFormat = "output discard"; - extraConfig = '' - metrics /metrics - ''; - }; - }; - }; -} diff --git a/nix/modules/caddy/default.nix b/nix/modules/caddy/default.nix index e4c1b0a..463b85f 100644 --- a/nix/modules/caddy/default.nix +++ b/nix/modules/caddy/default.nix @@ -1,11 +1,40 @@ -{ pkgs, config, lib, name, ... }: { - imports = [ ../caddy-base ]; +{ pkgs, config, lib, name, ... }: + +let + caddy = pkgs.caddy.withPlugins { + plugins = [ + "github.com/noratrieb-mirrors/certmagic-s3@v1.1.3" + "github.com/sagikazarmark/caddy-fs-s3@v0.10.0" + ]; + hash = "sha256-m5RHlrheqzoGqKQxixq+xTd2hlnCTets9zCT7aFka8g="; + }; +in +{ + environment.systemPackages = [ caddy ]; + + networking.firewall.interfaces.wg0.allowedTCPPorts = [ 9010 ]; # metrics + + networking.firewall = { + allowedTCPPorts = [ + 80 # HTTP + 443 # HTTPS + ]; + allowedUDPPorts = [ + 443 # HTTP/3 via QUIC + ]; + }; age.secrets.caddy_s3_key_secret.file = ../../secrets/caddy_s3_key_secret.age; systemd.services.caddy.serviceConfig.EnvironmentFile = [ config.age.secrets.caddy_s3_key_secret.path ]; systemd.services.caddy.after = [ "garage.service" ]; # the cert store depends on garage services.caddy = { + enable = true; + package = caddy; + logFormat = '' + output stdout + format json + ''; globalConfig = '' email tls@noratrieb.dev auto_https disable_redirects @@ -30,6 +59,12 @@ respond "This is an HTTPS-only server, silly you. Go to https:// instead." 418 ''; }; + ":9010" = { + logFormat = "output discard"; + extraConfig = '' + metrics /metrics + ''; + }; "${name}.infra.noratrieb.dev" = { logFormat = ""; extraConfig = '' diff --git a/nix/modules/dns/nilstrieb.dev.nix b/nix/modules/dns/nilstrieb.dev.nix index c013f4f..1d0fb7d 100644 --- a/nix/modules/dns/nilstrieb.dev.nix +++ b/nix/modules/dns/nilstrieb.dev.nix @@ -18,7 +18,7 @@ let vps1 // { TTL = hour1; SOA = { - nameServer = "ns.nilstrieb.dev."; + nameServer = "ns1.nilstrieb.dev."; adminEmail = "void@nilstrieb.dev"; serial = 2024072601; }; @@ -34,7 +34,6 @@ let ]; subdomains = { - ns = dns1; ns1 = dns1; ns2 = dns2; diff --git a/nix/modules/dns/noratrieb.dev.nix b/nix/modules/dns/noratrieb.dev.nix index c753f0f..e2dc8ea 100644 --- a/nix/modules/dns/noratrieb.dev.nix +++ b/nix/modules/dns/noratrieb.dev.nix @@ -14,10 +14,6 @@ let A = lib.lists.flatten (map (host: if builtins.hasAttr "A" host then host.A else [ ]) hosts); AAAA = lib.lists.flatten (map (host: if builtins.hasAttr "AAAA" host then host.AAAA else [ ]) hosts); }; - - minipc = { - A = [ (a "100.100.2.1") ]; # tailscale IP - }; in with hostsToDns; # vps{1,3,4} contains root noratrieb.dev @@ -93,12 +89,6 @@ let grafana = vps3; infra.subdomains = hostsToDns; - # --- internal stuff - internal.subdomains = { - immich = minipc; - paperless = minipc; - }; - # --- other verification _discord.TXT = [ "dh=e0f7e99c70c4ce17f7afcce3be8bfda9cd363843" ]; _atproto.TXT = [ "did=did:plc:pqyzoyxk7gfcbxk65mjyncyl" ]; diff --git a/nix/modules/paperless/default.nix b/nix/modules/paperless/default.nix deleted file mode 100644 index 5cb60cb..0000000 --- a/nix/modules/paperless/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, ... }: -let nasDir = "/mnt/nas/HEY/_Nora/paperless"; in { - age.secrets.paperless_env.file = ../../secrets/paperless_env.age; - - services.paperless = { - enable = true; - consumptionDir = "${nasDir}/consume"; - address = "0.0.0.0"; - port = 8010; - environmentFile = config.age.secrets.paperless_env.path; - settings = { - PAPERLESS_TIME_ZONE = "Europe/Zurich"; - PAPERLESS_ADMIN_USER = "nora"; - PAPERLESS_OCR_LANGUAGE = "deu+eng"; - }; - exporter = { - enable = true; - directory = "${nasDir}/export_minipc"; - onCalendar = "02:25:00"; - }; - }; - - networking.firewall.allowedTCPPorts = [ 8010 ]; -} diff --git a/nix/secrets/backup_s3_secret.age b/nix/secrets/backup_s3_secret.age index af72302..72aa71e 100644 Binary files a/nix/secrets/backup_s3_secret.age and b/nix/secrets/backup_s3_secret.age differ diff --git a/nix/secrets/caddy_s3_key_secret.age b/nix/secrets/caddy_s3_key_secret.age index fb3f1f4..d734f8e 100644 Binary files a/nix/secrets/caddy_s3_key_secret.age and b/nix/secrets/caddy_s3_key_secret.age differ diff --git a/nix/secrets/docker_registry_password.age b/nix/secrets/docker_registry_password.age index 83a4bc9..f97c5fb 100644 --- a/nix/secrets/docker_registry_password.age +++ b/nix/secrets/docker_registry_password.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg 0u8KWoP0daJZA97H5KkNCSn839ObF87VYU4AChP2XVw -PqtYdZR3xokf7iIQ9khrz2pt7n6FipWn5y3bmzDfdEM ---- 3tTg1eoL9exHUTtn3Uww7xWecgmzf5EyyQEZ//Bbjic -|HLXZ'v2" ssh-ed25519 qM6TYg I4FIet5K6KGjWaCvKbhK7UV4LFJthRpRVDO/FoARzxw +F/KQtQI78KlLe1jT84oxdg4UG8QuG8xAVAutzVM+kJw +--- TEgDiZeZQL2K8Nq/xqUKrkPKSXyO5NgRbx8SkfGl62o +(Lנ* 2ڃjED* ȹ^䥶IJsy:7 oRe \ No newline at end of file diff --git a/nix/secrets/does_it_build_private_key.age b/nix/secrets/does_it_build_private_key.age index 81b84bd..babd21b 100644 Binary files a/nix/secrets/does_it_build_private_key.age and b/nix/secrets/does_it_build_private_key.age differ diff --git a/nix/secrets/forgejo_s3_key_secret.age b/nix/secrets/forgejo_s3_key_secret.age index ae631cc..8313430 100644 --- a/nix/secrets/forgejo_s3_key_secret.age +++ b/nix/secrets/forgejo_s3_key_secret.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg z5yLpu5zJ9m7Ukl3nEHZND8Ot2cYnADJidYjELzfr0k -qy1n6TSeWniRFXLc1Zkpvz1+pmjFaMga0BeSE1q6RSk ---- fe6vqb3f0bRvXlQG4JglZ0h/At5kUPIM+VkRh91BCtY -".O J76~ԥSH-40 [vAD=^Ty"@A@,P|q!؊M \ No newline at end of file +-> ssh-ed25519 qM6TYg pA28Ib4AvSxoAZuGE7ZDW7CpA1GQkYm77WKNahcUFEE +HjzZ2b/iVig4reIgU3z0O1El+tct50LS5fp+SiQB+Pk +--- ExFpE2FxaqSuuSMtQTU+kzVz4rI2SriLKhcy0JHZXPo +Kz)`Q= gXg}| R!wD6?^4HγMV]`7L0T61Nd1 \ץC~ϝF \ No newline at end of file diff --git a/nix/secrets/garage_secrets.age b/nix/secrets/garage_secrets.age index 7f33bee..0da71d3 100644 Binary files a/nix/secrets/garage_secrets.age and b/nix/secrets/garage_secrets.age differ diff --git a/nix/secrets/generic_backup_password.age b/nix/secrets/generic_backup_password.age index 5dd7134..a3789b1 100644 --- a/nix/secrets/generic_backup_password.age +++ b/nix/secrets/generic_backup_password.age @@ -1,13 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg WSRKNimMa2qdIrTxZIsnybHi+gzOweCGmCx2D3DPciU -e6MO1QIL5FI0ATaR8hBUeE2ayLoyP4P7d5eO7liMBHg --> ssh-ed25519 91VHug JZjoc5tcVSQjIpbVGVca4P2s80Rb7NTIEKPhlXx9wQ4 -QWqufjXwphL4Kes5Ky2tWozdusA5AJwqgzT5JWCQbvQ --> ssh-ed25519 XzACZQ ek1dpX4Lqf6hd13B0dX06tTTmNRhZswxV3W1gBLKkXk -LQMnAxrr3ZfUc3Brn39BzIdyBe8Jma8LSML+eaBuKJE --> ssh-ed25519 51bcvA zA9GHEGOXETl9zX0yoHHB9B5On06KlEcYRba8eKGKEo -yPTcsFhDLiSLpWoZX0b7dNzZmBaLTUY8PSMVFCUzlRA --> ssh-ed25519 vT7ExA N7U+hiTEzwKvglQ0At36e/p0TTA7xVRb7UvuX/4Bbjs -acP9zBODifOsHVmM7COfBX+tkxZIPnQCUR0TskHacQ8 ---- tOLU9ascA2rI4R0oIg/0vsn2dEC1LBLFN6TFRcyrcvI -{đq.忳U َcO)|¥,+^]?PĻ$3m4Ǧ|c).R6@r] \ No newline at end of file +-> ssh-ed25519 qM6TYg AcP/Za8jdEONeSNcC2fm0rZg1VOMvqCreXdpd/iDKDY +dgBlpFUcvP/n86idjIWuKsx7jX6xEWQJKY+pdGG8XVY +-> ssh-ed25519 91VHug R4SIqnNLIoIVGIR0XnUsh3RCz+20M3pWoQGJta4y2CM +s4O6GBECMUQpUX7yhx9CrNgedDn6yomCg8Bkke+4vu8 +-> ssh-ed25519 XzACZQ OVHPNsSR5IfrAslyKuIMAZakz+k12GUGNYsGc7e5WQ4 +IQKyRtlh7lkwIdH79IYCYod93+qAqap6rGL/VJ04Mdo +-> ssh-ed25519 51bcvA NYivGhQwqPbjLY+Bb08ow38Rb1SBfbEotPwdDr/v7gE +VRT0QUnImc0unH4DoEg07+PhQ0a3IsJRrJIcgDzBtjU +-> ssh-ed25519 vT7ExA 6gW6MAGGmz7wqrE1cNgAJqhLyLBDnAkh3IFB/EJf7Us +nhE8i7G/n/CnLTOUYsprFFjWCA+v/CmOpYRB8dAAjaE +--- WvW+S65yf7YP+UsQH7VY1CSRqIFyNQAMBzVDCKcgk28 +wBэ*N%uz>9`?T7L?):g07޵ Lbxa޷$ ? \ No newline at end of file diff --git a/nix/secrets/grafana_admin_password.age b/nix/secrets/grafana_admin_password.age index 53e26d0..7598694 100644 --- a/nix/secrets/grafana_admin_password.age +++ b/nix/secrets/grafana_admin_password.age @@ -1,6 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ jIs+NClvISjvJSkJlkkGX5ZJzFge/1Nj2Wi4en/viRw -H1sfzg7cCWmCVg9GpFF5QNVVJjllxbmt7wBETRfM8hw ---- hOo2vi9EjLwAa8PQzJGdzUZ/VIzfhM7TnPsQ+OYJzcY -%f>8Àuw[ l*V(u2)e&X) -ƼQ"X|iO,';ItʽoZ՝kE)I 0v/? \ No newline at end of file +-> ssh-ed25519 XzACZQ 3nDPKBmskuTAvsJAqjRdIWyRBmz4r6sPAKkgUu4DWV4 +VHlijfVCMdwh7VruZkldVzEZoNLanXxq/yDzmiZFIao +--- glAFu4uwb5Jk3cSyOCBWJr4BfJVAi9HxzWkvTVm1dZA +ƫs ȷocp"H഻`3MrPavEP#9"b}% wBoilQ@XC~y"zP4SԊXh}Pæڡ9 \ No newline at end of file diff --git a/nix/secrets/hugochat_db_password.age b/nix/secrets/hugochat_db_password.age index fec59be..a0c5bde 100644 Binary files a/nix/secrets/hugochat_db_password.age and b/nix/secrets/hugochat_db_password.age differ diff --git a/nix/secrets/immich_secrets.age b/nix/secrets/immich_secrets.age index 08c97e4..f485b4c 100644 --- a/nix/secrets/immich_secrets.age +++ b/nix/secrets/immich_secrets.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 yMKb8Q szKG8gw88EAiUx26fzY/pYMVb7Vb91FZC1FEQTYRZDY -0jBl8757lsXnxWE90iZLJcO5VUXz+E2+7m/ZfNq87J0 ---- huOResyzGVCip/Sdoyvid3TxFI01wiXNaHdZ/oGI5Zg -*clHxAh5H(dU'nҘ;M.Vx}" f 9f~Jv9 \ No newline at end of file +-> ssh-ed25519 yMKb8Q wDQ9QOIpJMfsxGr63x9PozZEVfy1M0XvW9MvIjBjlSo +eAbDN8ZB52vcC1zEXKqjWUYb+vvIJVQ+f9CZmk1Jcos +--- ZRGd4IncBO5g0BIoezzfvCxNMAVP3cgmsF8Co06u+fc +Ui,W b%d9:dq{ ŽL[M ,d8{6 \ No newline at end of file diff --git a/nix/secrets/killua_env.age b/nix/secrets/killua_env.age index 3633642..531b5e3 100644 --- a/nix/secrets/killua_env.age +++ b/nix/secrets/killua_env.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg mMvnBUGVS8d0di+drDXo7mws4Uz5T+nZmQY9uUpKfQ8 -rea2peORLvRF6qYtGKFnylyEdnV0NTc6QO3xSgp/y1I ---- xyeBOfVq3hwyckUma5LWOU9cWHzg/XY2f8T/0Vc+njk -G6kN0 !Um[rHꟉt}׊X'yqLbEY:n NHnHݰ'W|3z{٢'N&M`# \ No newline at end of file +-> ssh-ed25519 qM6TYg 4XizqcJTul2c4nKebIgHNBlX1wfNM6ZdJIi+uD4STCI +wLKLC8dfC1jVWNLQR2pmJM3+yvlILUkn6be+x/l1Se4 +--- kgeOkLbbLqXAK8urZUOVhqPKn4AWulo4hGbOkgr+fOU +BSXN ssh-ed25519 qM6TYg OO4FC/zdYJPzw8ujHG66sX2ShWSrWfCKRj1z9FYOwyU -84DDDS2TPxxoGxxaj4WLJN6zZfVIH7m1xC1mRMMzBaM --> ssh-ed25519 XzACZQ YydvMTzqlr24U79p1vCZ0DIB1DmLNxp/kLptb5WtmCI -KaJ0zuNwVsYr0pLRB2MJIix22xTdujqspFPISU3Q9EU ---- TzKmJkMsYD2ZS7LJw9qdVRsBeoxMPQjOyovIoopesMI -S p+rGF "19,kVKЪ鍆ShnhyldFX+ d; ssh-ed25519 qM6TYg bv3MPWeJTJj/lrwKDBAv4T+OrRdD3ViwX8HLCmCKghE +MGP87vT3Rmf+aqhMMXyZIs4OeMkS+uc+je6Zkod0hrY +-> ssh-ed25519 XzACZQ cUkJyWCO6HkdxCqSnv9onmEUhEQY+Pj4seR/lH8KSAg +qTUgF/iT2IoJf7UOleaayWbkJbn5dgSVHKctKWnqfIw +--- BOvXie+k6OIewLDVF+Rx2YzkpytshqkFGCL/uYgljNQ +}pSS y*Sp*>ݖ  u:0b:=)tS\HNb9_mٝj{)(<3&Ә`R [{aܓ! \ No newline at end of file diff --git a/nix/secrets/openolat_db_password.age b/nix/secrets/openolat_db_password.age index 234ac01..cc08707 100644 --- a/nix/secrets/openolat_db_password.age +++ b/nix/secrets/openolat_db_password.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg anB4Ljud6na0zsnFkNjgBcicE6kFUg0y2xTlohEUggI -gUTv83/Mktm8CyXdKEf1eu7NpWJd/hmiGzKs91WyPCc ---- zxoGip/R/tIH30MATCWht9P9oUxU//L/jnf6T/DwKEI -U͌5fq{!%ZE; -xȻvnktP\-1PۺB}gMn{3o*]ڦ0zU52߈@yrUgA -4)F ->"Ub \ No newline at end of file +-> ssh-ed25519 qM6TYg 7Nt/x/IT9ofXjrRRV7coT6nrrCSOCkqUqflm1oXLXTk +BafDaEiVpuT3SDVXvuD31WIKe0QlvAGoyn4MzUm9LfQ +--- BsY9/meRTzX5oCBD+w9f+2TO/TdPD936xOjgtQMWuag +RN|- +[6q +r7d% [3K`I{!u5ƃnӺMvodz A~ǍT QGh?Nw/YBQn_`_,ZFV8yw \ No newline at end of file diff --git a/nix/secrets/paperless_env.age b/nix/secrets/paperless_env.age deleted file mode 100644 index 1da8fb8..0000000 Binary files a/nix/secrets/paperless_env.age and /dev/null differ diff --git a/nix/secrets/pyroscope_s3_secret.age b/nix/secrets/pyroscope_s3_secret.age index 637f942..e96d5b8 100644 Binary files a/nix/secrets/pyroscope_s3_secret.age and b/nix/secrets/pyroscope_s3_secret.age differ diff --git a/nix/secrets/registry_htpasswd.age b/nix/secrets/registry_htpasswd.age index 5ffafb6..dce3ea8 100644 Binary files a/nix/secrets/registry_htpasswd.age and b/nix/secrets/registry_htpasswd.age differ diff --git a/nix/secrets/registry_s3_key_secret.age b/nix/secrets/registry_s3_key_secret.age index 72fe931..5649f2f 100644 --- a/nix/secrets/registry_s3_key_secret.age +++ b/nix/secrets/registry_s3_key_secret.age @@ -1,6 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg wkP6wv0rewclikCkz1XjByNu8dWtQgk23SW++uoNmy4 -Pqd1t5ITKxwLmBZxQZqQ1jHn5o+atN2L5Kdk02SZiDQ ---- vcfVaVUg2W8jTf+BrDYg5TKccjk0I6iA7bJEovIvsVQ - EcbMf%sч߶:ռ^zm7CnD;3}ZѼP5% B1Cu`?`4z}my)^⤅܍8;4vnTI,S}x}阘RCc"I zh -;"(?^aFoO0zcʕ3 \ No newline at end of file +-> ssh-ed25519 qM6TYg /73Z7R1RE4lfUfVSeJqZjbGA5yjygfrxKi5iuMMxrno +tsbPaW/x9HFT/tG+5F3n/3SsuhmswVIfHVLNRAzdiP0 +--- jHapfTz6oq7gdrgBn+XNQdMZ67DbrFPBY6KKzb+wfjE +U1r(RMN8Ol$DNu3JonBOc%AT~RV##[;3*6/5gD]2%f)fxv +]h:d{_O~2tiz28 W>BT(a%͉l`\ \ No newline at end of file diff --git a/nix/secrets/restic_backup.age b/nix/secrets/restic_backup.age index 38f3560..c968ff0 100644 Binary files a/nix/secrets/restic_backup.age and b/nix/secrets/restic_backup.age differ diff --git a/nix/secrets/s3_mc_admin_client.age b/nix/secrets/s3_mc_admin_client.age index 0287a9e..e64d1a4 100644 Binary files a/nix/secrets/s3_mc_admin_client.age and b/nix/secrets/s3_mc_admin_client.age differ diff --git a/nix/secrets/secrets.nix b/nix/secrets/secrets.nix index f9fed44..22ecaff 100644 --- a/nix/secrets/secrets.nix +++ b/nix/secrets/secrets.nix @@ -32,7 +32,6 @@ in "website_s3_key_write.age".publicKeys = [ vps1 ]; # only used by Noratrieb/website GHA "does_it_build_private_key.age".publicKeys = [ vps4 ]; "immich_secrets.age".publicKeys = [ minipc ]; - "paperless_env.age".publicKeys = [ minipc ]; "wg_private_dns1.age".publicKeys = [ dns1 ]; "wg_private_dns2.age".publicKeys = [ dns2 ]; "wg_private_vps1.age".publicKeys = [ vps1 ]; diff --git a/nix/secrets/upload_files_s3_secret.age b/nix/secrets/upload_files_s3_secret.age index 631523c..50ec7d6 100644 Binary files a/nix/secrets/upload_files_s3_secret.age and b/nix/secrets/upload_files_s3_secret.age differ diff --git a/nix/secrets/website_s3_key_write.age b/nix/secrets/website_s3_key_write.age index 9adbf22..96b92cb 100644 Binary files a/nix/secrets/website_s3_key_write.age and b/nix/secrets/website_s3_key_write.age differ diff --git a/nix/secrets/wg_private_dns1.age b/nix/secrets/wg_private_dns1.age index f218338..76fd998 100644 --- a/nix/secrets/wg_private_dns1.age +++ b/nix/secrets/wg_private_dns1.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 LZU5Eg OKL541Y7HQSCBtUqWQVdIxZK9HiWeaPyAWwkcj/bsgs -PviTqNl4VLbQtErGDpXFEJSeRf59Mx0v3qcznEZ1tTo ---- yRq8T7TGu/yBKFx2r+t8gbohrUHDkyXdvsB3n5csgpY -kMQl?N'!.LlLBoDY:_Vctci= 3rKvMfDu \ No newline at end of file +-> ssh-ed25519 LZU5Eg 3Bde2BfrG8qdngKCIg4xeXnkqqdrtcAZfW0REYwkmWc +0Js204/ZpkBK9mDZwhYOY1IGW8yA5L/iMAmrZR1r940 +--- V7Xj3KkcueKzPhl6wjk12zRrEmFPMpUcQd799p0Dqr4 +~TO80} Q. {q6Qu׆%N6Ќa|41րZՀ;Dz*^ѻ \ No newline at end of file diff --git a/nix/secrets/wg_private_dns2.age b/nix/secrets/wg_private_dns2.age index 536fb4f..1c04d1b 100644 --- a/nix/secrets/wg_private_dns2.age +++ b/nix/secrets/wg_private_dns2.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 5bWSnQ KNg5E8fLL/rDMbRGQDujv/NaSUVGY/HmxFgIVK7vox4 -bH+Gywr/dDW3UPfQpLpWg9sVZq+LfE2aDs29chCpaDk ---- mYTYZH2KoiKyxtfrxgIomqaaCyfnLVNwXkUzp+cDl7c -Q}B.$bq{4;5-;3Jyble̞do#i({J譍y>˨] \ No newline at end of file +-> ssh-ed25519 5bWSnQ V/5bLxQqdZEF9tgSPGgm7nEpnyNGScgSVfjS3KOvxA0 +oKHKz5IIZNdsWhBCTCqvHVLAJGC+LEC7RuMgQHI9Wkk +--- 71jtq96kfCYsB8UGSccc2F6qWtj7DO658MeVWSD+L64 +UXd2ClEV~Fgip%N6 +t%͢Ż{LZ@B9${g&PBHQہ%4 \ No newline at end of file diff --git a/nix/secrets/wg_private_minipc.age b/nix/secrets/wg_private_minipc.age index 2fa88e6..b5f0470 100644 --- a/nix/secrets/wg_private_minipc.age +++ b/nix/secrets/wg_private_minipc.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 yMKb8Q 8ESNEQZaTfjWl4qGZJV/GPN+tFozDmiZZtXCctRD8yE -w2+Pjzmotz2X0O8ehb3TTOLk9YCk8hqRqNKfNNnLQIw ---- pfmBROvSCK/41HS44uMmwU5izVCyHrRirYjL/WBAhZQ -m *Qv"+JQ Ā'PhD>GJ]ĠLݩ N̤ۀ \ No newline at end of file +-> ssh-ed25519 yMKb8Q o1qLnZBL+o8wrQYM6bo01DsCKVmA/NCzLe84aO4NSlI +iEnVZGcr4wyMN5b5f9Qzt1lmycZVe+km/8ApNvq6ME4 +--- MiV3GRLz1rEy283zGsbTtrAbQgmdW0pobJE83BmPrmU +G^%Lj,sCIC&@>#t$.2R+p.4 ke^+sCgn-z{ \ No newline at end of file diff --git a/nix/secrets/wg_private_vps1.age b/nix/secrets/wg_private_vps1.age index a944270..c186827 100644 Binary files a/nix/secrets/wg_private_vps1.age and b/nix/secrets/wg_private_vps1.age differ diff --git a/nix/secrets/wg_private_vps2.age b/nix/secrets/wg_private_vps2.age index 3cf2891..7b8faa9 100644 --- a/nix/secrets/wg_private_vps2.age +++ b/nix/secrets/wg_private_vps2.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 91VHug nuqwTTdoNOLWvbQAIhl9WguvArxG0jNfkFn3qM8VyjE -NvhMCreuxdWHezfH8cF4wXjO8ZbG7yQC8+sVnWFghFM ---- OGewUdFWzL1PzHGBHB7ulJVi5eX6UXKLFUyfbvGErmY -ʋ.\Ņiқ~`Q ,W;m pQTY Tz?]T-s4)ZP,6H5bԄ7h \ No newline at end of file +-> ssh-ed25519 91VHug 2cqCCA9Di37CBwXKIg2nRfgX90fqVQbIDlvbys7uSCQ +IKMUR81lUusM+BqXSMiuCEyfeAfup0ljLCZ09GVjv0M +--- oisBggLksra17ZbAQcWuIX3iOo2hE+De/mtXpmDDXGQ +ڗ7f-1|H8BU]jq2I6ۖ7yBL4ij"d_+%]U \ No newline at end of file diff --git a/nix/secrets/wg_private_vps3.age b/nix/secrets/wg_private_vps3.age index 5cb419d..50d20a4 100644 Binary files a/nix/secrets/wg_private_vps3.age and b/nix/secrets/wg_private_vps3.age differ diff --git a/nix/secrets/wg_private_vps4.age b/nix/secrets/wg_private_vps4.age index 7915ceb..b39120f 100644 --- a/nix/secrets/wg_private_vps4.age +++ b/nix/secrets/wg_private_vps4.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 51bcvA jfwnJ0gZN/FeF0krZ/ERWq/eqKBGwANBwea3xCJLeHw -x8ccoxcT8Yn99d6aWzZ667jUjE4dHPfz3ZIg9qG4xe0 ---- H0b14xAs2FTADz89JQx2eOSmAgN3Rs5A2o316xzISwc -@}`͠&9WjWSEH@V˒x[?Uu.~J*7ҷ< \ No newline at end of file +-> ssh-ed25519 51bcvA CkaPksfSDKWRMaL4FV7vI4VZ2c8Fd2RlyRW8DEkOkgM +NrvBSSPDrwNL+YKgBTHqQuLhKgGy1+/H51JTsA70Dww +--- 6qkEageKcIweJ7wWcqb2HZp9zJNTyLcoQ+Gv/+O6CJA +(,zfD8)]|P+a {n$ Ax"Â]K \ No newline at end of file diff --git a/nix/secrets/wg_private_vps5.age b/nix/secrets/wg_private_vps5.age index d870bc4..3f4dbff 100644 Binary files a/nix/secrets/wg_private_vps5.age and b/nix/secrets/wg_private_vps5.age differ diff --git a/nix/secrets/widetom_bot_token.age b/nix/secrets/widetom_bot_token.age index c9bb838..366d1b9 100644 Binary files a/nix/secrets/widetom_bot_token.age and b/nix/secrets/widetom_bot_token.age differ diff --git a/nix/secrets/widetom_config_toml.age b/nix/secrets/widetom_config_toml.age index af313d3..fea9a10 100644 Binary files a/nix/secrets/widetom_config_toml.age and b/nix/secrets/widetom_config_toml.age differ diff --git a/secrets-git-crypt/paperless_env b/secrets-git-crypt/paperless_env deleted file mode 100644 index 21295ce..0000000 Binary files a/secrets-git-crypt/paperless_env and /dev/null differ