diff --git a/.sops.yaml b/.sops.yaml index f32395ba5..2fd0efc3e 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -106,7 +106,7 @@ creation_rules: path_regex: ^modules/secrets/hercules-ci.yaml$ - key_groups: - age: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFiozp1A1+SUfJQPa5DZUQcVc6CZK2ZxL6FJtNdh+2TP + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILAkBZMRNgsJ/IbLtjMHqBw/9+4tyn9nT+5B5RFiV0vJ - age1dzvjjum2p240qtdt2qcxpm7pl2s5w36mh4fs3q9dhhq0uezvdqaq9vrgfy - age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz - age1d87z3zqlv6ullnzyng8l722xzxwqr677csacf3zf3l28dau7avfs6pc7ay diff --git a/dnscontrol/dnsconfig.js b/dnscontrol/dnsconfig.js index c41a4894e..567045e4b 100644 --- a/dnscontrol/dnsconfig.js +++ b/dnscontrol/dnsconfig.js @@ -59,11 +59,11 @@ var cnames = { "darwin-build-box": "darwin01", "docker": "zimbatm.docker.scarf.sh.", // Used by nix-community/nixpkgs-docker "hydra": "build03", - "landscape": "build03", + "landscape": "web01", "nixpkgs-update-cache": "build02", "nixpkgs-update-logs": "build02", "nl.meet": "nixnl.codeberg.page.", - "nur-update": "build03", + "nur-update": "web01", "prometheus": "web01", "temp-cache": "build03", // keep-sorted end diff --git a/hosts/build03/default.nix b/hosts/build03/default.nix index be7783c57..136de7dc7 100644 --- a/hosts/build03/default.nix +++ b/hosts/build03/default.nix @@ -3,7 +3,6 @@ imports = [ ./builders.nix ./cache-harmonia.nix - ./landscape.nix ./postgresql.nix inputs.self.nixosModules.buildbot inputs.self.nixosModules.ci-builder @@ -13,9 +12,6 @@ inputs.self.nixosModules.hercules-ci inputs.self.nixosModules.hydra inputs.self.nixosModules.nginx - inputs.self.nixosModules.nur-update - inputs.self.nixosModules.quadlet - inputs.self.nixosModules.rfc39 inputs.self.nixosModules.watch-store inputs.srvos.nixosModules.hardware-hetzner-online-amd ]; diff --git a/hosts/build03/secrets.yaml b/hosts/build03/secrets.yaml index 474e788bc..8e4c7584f 100644 --- a/hosts/build03/secrets.yaml +++ b/hosts/build03/secrets.yaml @@ -1,7 +1,6 @@ id_buildfarm: ENC[AES256_GCM,data:18qi8jBCsntp/6mM8iFkpUS+4yQAsaL6JtLBR9fT51XSWLOVgShRpqe6mTZTxvp7WeUA0QxIN5ZwIihk1KmUapTF8O7NIX3ulaustzu30A4Rm//oaS7xwV5GNji7TTTK0dtag6eLYiXqgguZ2aGuabDcn06f7wNzru7BWgJWJRVWi+yAnuTrZzOrhCvQ6uw34WXOa7BYxvXpHrLlIkm1mH54x86kqWpSkIhGoifW5kgx3WLyI6N0OnVISh4Uh6p7qH/UIAtDPrSAjpMsTcS0r9s4gaIClDbWNnq72JOGUmwH11dx1jhujMtaI6lY+i6+JIwSGJFI9+c6Rfl7dIAwY5f61Fv6r7f9O2eN1g4xvzVgTnkU47/yK79ePT4We/OSyxH66eKBmfXb1ds3kq+EF5hnNiWFNETIQIYXvcM9dBTrNwU8CVIrZkDRmvG5/dK3xAibTGYwNZ9fbCuYirE4XspurwFczsH2nchVMBbEYl/LlZYcUh/UgRvEhqjeTVqz9XkcWX5UJfSViaRbNYFZ07B74oPOK9hcdAPs,iv:RKMh8cCfoiU6AmafVtqVizfeamAkuqEU8HxTOppAitA=,tag:gJvEUhGLw+03YxpSCxaAag==,type:str] hydra-admin-password: ENC[AES256_GCM,data:t0vmchbXXIAzvM2nxm4j16N9W67yWRb439M=,iv:qr/OfyMvTzi6Znw446KtxE2erh3XWi2VTJvVL2Ot2UI=,tag:mS6HlE6nojkemjp4F59+wQ==,type:str] hydra-github-client-secret: ENC[AES256_GCM,data:A9d2mSjJzVA9k2vzCTg8YYIH0hMhz1jobX0TScMKWERUYZpB8iMfl0w=,iv:dwZ8wRri6Ko+8xdvHw0JrJw0iLPT8vnDyil3oMSHBF8=,tag:n6TKdHEGBgHif7vfnA+X0A==,type:str] -nur-update-github-token: ENC[AES256_GCM,data:KIZCx9IeuBHZei2V13iiyHzCedhkkGEd08mVJEc6F0DWQn1wtzC7+w==,iv:pNVRj/RR7wj64g640F7Vo4H10ijsxnrfFQnt6YHBug4=,tag:UlvOMNB5JZbuJaD9TcJ2UQ==,type:str] hydra-users: ENC[AES256_GCM,data:NJUyqPNoOlP2JXIIzGyNyb0sBMHFbu81JERBigD8zhADNj2/7VlDA4u/SwzA4yG+8Qs7Ll6Y4CQzerwH,iv:qeJv3+I4+e6nQlI2w5oGtcpLtniIE4sTFdK5YdVy/Zc=,tag:6nysy1xFQElx0E9lYZHB+A==,type:str] cachix-auth-token: ENC[AES256_GCM,data:AlZlzPSdYSrQV7ENPSvUGbOwTmvLeRRuPBCKUHJJLYdmwcC3yuGER/O5xL809fuDs+ii3BTfA7So9iZr0EFSfreAy4s7KkD/nRElTf71sGNN/+01S9pkPMdgXtdPxx7QySpIiuW+PYKgEWcn5ZdMFNurIx8g8O0QMqkppqfc/s9v6f3zBD1VQ5VM+DBksdYnsnVhuXA=,iv:AUSWe1xHqjvqkgxIgejgyyw13Z9cJVVSYdk6+1Hdrzs=,tag:WF9soVRIx57VBN1A5I99BQ==,type:str] buildbot-github-app-secret-key: ENC[AES256_GCM,data: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,iv:RnOm+3nmwpB2fdaHIrUmLMPTHqySYeeoLn3LDU/GIIM=,tag:wKjwBPU+zzMrVC7I6Hag3g==,type:str] @@ -10,7 +9,6 @@ buildbot-github-webhook-secret: ENC[AES256_GCM,data:AtUFcOjLivJt8np5451Wfol5s48R buildbot-nix-worker-password: ENC[AES256_GCM,data:TaMHVzlzuAHfTBAyqG5JJFwpG2We+wlXva3YJnNkO9KSX9PIhnRHVES72jO63AkhvfBVEg==,iv:rTpaiCYcedcsy115BEDep68Mehb6knes7OxvBrEOrUQ=,tag:dD4Hg4oR3SfpYdP1e8V2jA==,type:str] buildbot-effects-nix-community-infra: ENC[AES256_GCM,data:wAYSvEza+1xjT/rIp5MtR3HEQe3OscRBtrWF/f6G/z+ftaiWXMfWhW9X8z53I20lzx9a6BqmO4jcWAGmXRSV4TX6wxKsUP9BnzxTImDS41zWfOtHV9sDifk6jmVJyAAsrY8CrebGTmPvWUXEUMmAZkUorQkv8gfxoL66GCtPfqa7d1OSKX8rAXd1YAJL58aXFeD6X6iZqo2tVd1OhlmUuFj5oum+9uLPjCY54IfilLlERw5DdTPDhMBdKt5owR0dpJDmp9t8i0AV2j4Hm36ZsY8L9ket1iB04MlapsUI24RiXHk+aFJqSy+0onvmqeniiBeaa106YomSQAS1cyOp0U+Rcqwhtnh9MNUZzciVXi2F5nkPzA3OcbQh8MDcJ/66z/VUkSac0iMXvr/47d5V0XCm9JSKXuijOUGTu9LRbdEAAQ+gsZ/Z8i6+9d75CeSoVH5Mtm7eU4CbhloNmpAcz5qyFf+sRgWz5qK8z1MwT795P/P/Oi2YQswtwnyLO7UkQ5tCrE+qcFxM9cAAcJzkzGctB5QdHDaPkkpMGic8vpAoYgx3t7Qmasuef96Fhhj4lk10sTTUrWZlnFbmduO/fDOULvisnW/BTpYsnsIPSKREg8wQAu7Fiu9EO0TZOagAQf03EiFDcxosetxPJIXoNWsZK/1LsX+7SnBBklVDtwxu6urOUCW8vYXD4aGZvkTGc6O6vwiOs+oEHd6J7Mes/+23hTzldnFobodwnzbRNVt/WT2FQjX5qFehyxbARL+EtT4MQC4sWGpXSybUs10=,iv:rdLHfK4NbCaMIIhhQd2MfVf1DdKKF9Sqe4Kxuy57yok=,tag:DPxsDTLIhA0d4KPXwseL9g==,type:str] temp-cache-key: ENC[AES256_GCM,data:weL92egwmo4z32jXmWjgbfHo6h61+mWwHrHVAg0N8cHzBOjgsAL3NTRgpiiaePw/FcZa1rJ/ygBGyUYJbIq036fxhd1I/Vu+dPFXz7PPIphRj/q8wru21qfLXep39rk+bIqsJJB2++070SCKwgRLb4re9cM05ah3,iv:sX78dExpTL+UFkHWfQmYN8nsZcMCFhrgXwvtzvoWdJA=,tag:j3MNmXSdQEuh9oYP00yJAw==,type:str] -rfc39-record-ssh-key: ENC[AES256_GCM,data:2jmn3F+y1xFACYfUoxJqp7EAEZVVuDYUGISk7/d8xAfjfpnekAO8OHRVT+RSgLQuVXsV7ffocb3M319+Kgdp5/hRUr7zNlCkBTMdXz9XBHDUmeEjhjtjQCmH0WYRjLgpyDrUY4gk1+EuAIKY0J9MktKJ4JKIxSm0Keei2iByoXxIjQhHDNg48UXQBW0A8ZPqWPmJsHCFtGcQXSVG/rehGqYh2cDC5Q4XpU4Rw1j+ZyE81RakbNxWx/uIVvbQxGuYI3qXyOunllokj5jh8VBQUpz3QdCkIR7dFTuoBy7N79sdZntAqHhNdeZPLpxIVTNwGBzgTvdcA9PCQSIs7TYg7X7l98Z9QQUnSXpg3APz+jlsoOF/icXrcOxJBAPAhBqH/2mBUEjbNiWQR44cZi4Bt6n1LZCA0IniZsBwUFDE9o8a4z70Nc2QGcLLixbWc+g8GtrH1qxtXe2mZ13uWFL1THuIypJzrbGKAPV+NAao9Q60znzWgQiuSkN2eXaGZQLadEXi,iv:wbhy54VM7WqRSgjoyjYKenliXgxjd41lFJdTr+1UH84=,tag:DB7VXqK2RHdadeEHabTwRw==,type:str] sops: age: - recipient: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFiozp1A1+SUfJQPa5DZUQcVc6CZK2ZxL6FJtNdh+2TP @@ -68,7 +66,7 @@ sops: Qyt6TXFFd2sxNHRrajVxVGozVWg0U0EKCgA2SWLCt4tK7q1xR50PL3vbzASvc9om 0RQxc/7XCcIwpvFpw89q2u9BHxSK8DMl0qePNq/w3Zroi1dyqOD7rw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-12-05T07:45:10Z" - mac: ENC[AES256_GCM,data:xkbljRfl9/ODw+RZZnCTFQRZF0QdVHzuycrYmVjF4Wday9Yi5UpqRLQgOnDWPf2dcal2VrDG3GIILSeZRhF+S9ewKUNw0MYJ5cLThI9PAHiu0we8ph/0b1X67mLZiMz3UtdJw45l4deRZIFDwNr+7cj7cBzcaX6/143HWOtcUKU=,iv:ZpSHiVPfyaGQvYfxgatS6ZQ6dx52FdzeLxLfJ3JpUq0=,tag:+QLt83tlzKu7WVw49fLhBQ==,type:str] + lastmodified: "2026-02-14T22:55:11Z" + mac: ENC[AES256_GCM,data:otEMvyVsxALRsZi8yjUqfTRDhu86Zy7nXdfV3E01x3rUB54s2mOqrYfxqSqM4VlhxAqLBA/1X7RssQpg5EyZUKrKU116qtwZYugmpy8gpzvTEL+oBji6DYrZeczJNsPjJfk5kZddfQKiD52bEDCvsMCEYV4ryJry6NBEN1RTTdc=,iv:PgvnbLPCzNNaTK5ooXM1lmvMyH2nZBt00EK7tc4uIww=,tag:f2Vg2KGL6oasGxzjw1U6fA==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 diff --git a/hosts/web01/default.nix b/hosts/web01/default.nix index 0f0c71995..5e65e6f1e 100644 --- a/hosts/web01/default.nix +++ b/hosts/web01/default.nix @@ -2,10 +2,14 @@ { imports = [ ./gandi.nix + ./landscape.nix ./postgresql.nix ./postgresql-tf.nix inputs.self.nixosModules.monitoring inputs.self.nixosModules.nginx + inputs.self.nixosModules.nur-update + inputs.self.nixosModules.quadlet + inputs.self.nixosModules.rfc39 ]; networking.useDHCP = true; diff --git a/hosts/build03/landscape.nix b/hosts/web01/landscape.nix similarity index 100% rename from hosts/build03/landscape.nix rename to hosts/web01/landscape.nix diff --git a/hosts/web01/secrets.yaml b/hosts/web01/secrets.yaml index b5e9c5b15..4fdddc0b3 100644 --- a/hosts/web01/secrets.yaml +++ b/hosts/web01/secrets.yaml @@ -1,5 +1,7 @@ nix-community-matrix-bot-token: ENC[AES256_GCM,data:rUi+deMQLcD0LnzpZqeezdbtwZNhHwUWMv5KlEBfWcWqJ3cZIV66G6L5MJ7v4b0r7OKrVSpQDinb+UXALO975OMr9L6EvO4Lx1RMxA==,iv:7ljmHi+P9cVVyJhpqyVvaAVy4ledqYFuqjX71J8fCk8=,tag:dAX+cJZbZ+1T9OHT57wxhA==,type:str] oauth2-proxy-key-file: ENC[AES256_GCM,data:HaW/nIfUdrilacO9JzsEvOA+pxZ4RKxJUN8jHSEyy50g8//RRpflR+fLXZoaAOV9hE7ztWa39EqTxGAi0AKWUCrS0v72NfI+WVfsdEOifQrkPFh67fRlD7xTDDVB6hmP4JczIpu+3kGJhZm5KuQ7bNeaf6PJF1QKQ+gXYeXR3NAszfoObRq+SYR4CmA=,iv:HELIcLH/2+ve5xT3VDXClVwGHMSyLmVfJcZ/RWD/x64=,tag:5NiDA1vketWZjE5NlaQE+A==,type:str] +nur-update-github-token: ENC[AES256_GCM,data:m5ua0PHtBWUoo29T8Y0U2QLN7YfgVIKr4a9WK0mAtu1Rgt0ExFxoHw==,iv:oJx5oUtqV6w1JfZe3ZmEaxwxJpzdoYsLdlZZjI0nbrk=,tag:ZRZc+okrI7Nipk9BAVeaqw==,type:str] +rfc39-record-ssh-key: ENC[AES256_GCM,data:HzKUK2K0HD+OYhVnP+bu8TgGpC+ep9WVWDVakw0lUovs+FDHm4ikf66NOthjOdsq4B0NAglabcqDnY2eDOk3I8EpsrrUXCy1FnYTM28BgKoTJWFl/ob5OJvSpmi7M8+w46nT3Cdy0c9atE3hVaS1gRm7O+rVIMSaVV5qbfHwyMTYS5Jc8NvEsUK6MnzSrLIjYIurd+z0j5lmHdSt+LzcnTkiQ36kzPbyQLMJIOwv5zwq33oLfK6qRUiIrnrhXL34iCZYAsF2Zo1cmtTIrICZ49+8pokd11yscN7tYWtUUvDy0qcVDuFoFm4OMe3/nxCTNx1fC3+WtilvdjpZ6NrRM+knPQAMafVO+meedqmdCSfNY8MtaotEAT3CZCQcKRDsuxWSc77g8+gKVZnZQ323aZ5X8YqQEA6Vv6Gf4NhfoSZ2+/qPNI9yud0MkDJ84YlNEVMFcTXhF33cKsikGvNxZmHFcgKRbPObOWbHP878Wsk0/ROR98IKXfAO+6npMak0ZKS7,iv:EzxiQ4/mM84U1/mZRD9uzfrrvdaI4YUYqWrDH5U+Oas=,tag:96hEB5AQv4CnXx4y9Z5FPQ==,type:str] sops: age: - recipient: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILAkBZMRNgsJ/IbLtjMHqBw/9+4tyn9nT+5B5RFiV0vJ @@ -57,7 +59,7 @@ sops: L0hzZHR0VGt2Z2JYbUZSbU1qZ21aVDgK/gMacQv99ossbA2XfhNUjwGDRhHYrAut AGr4DcIYXrofJry/sH5w7ieFNuy60939k8FWa94zBoMLsyZk75tyUQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-02-14T04:32:24Z" - mac: ENC[AES256_GCM,data:lxXJZmRC5sel6FrHyy2SnNtOJ54MqjdJjUrooRZJEozHSl3UhHG2L7Yng4wzM7l2iJr+h05mdJj34P8BeyJH/DToqTJTf+bBH/NKTDZs0tvLwoABjGu5UoyHopW2AFKN7rhnU1CmedezZQ6HSG0G0hHw4l7sg/3XEkbnHncphuM=,iv:NzHpRi68COWvVq1ihIY6VUvzlyHLG+BzIpdLqdGDR20=,tag:ElKIYiR+piLImxBxv5/LvA==,type:str] + lastmodified: "2026-02-14T22:54:59Z" + mac: ENC[AES256_GCM,data:2oruHg+fJh1vEwTUom8JuF5r8/Srj7jIG0zKuv/UKzCDLqkDT5YCgnFBTrj5BX8UHfaOZZNa3t6zsFGxEl3IAno9vo5RDH3wfG0hmWKqfmkL28g+uETEKqy4rkx5ONLbK5WOyzz0OY58nVpsjMcOYb+2KN2s5WMHKBcDeE6Oq0M=,iv:bqbkbYNgj5G4MkzI0T4sl4oaCsLJThxcpteH9xjhy0s=,tag:2X49tC3v7DoLXWJD7II8dg==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 diff --git a/modules/nixos/monitoring/telegraf.nix b/modules/nixos/monitoring/telegraf.nix index d09420ca7..48bd7ea86 100644 --- a/modules/nixos/monitoring/telegraf.nix +++ b/modules/nixos/monitoring/telegraf.nix @@ -17,13 +17,13 @@ { urls = [ "https://landscape.nix-community.org/" ]; response_string_match = "NixOS Manual"; - tags.host = "build03.nix-community.org"; + tags.host = "web01.nix-community.org"; tags.org = "nix-community"; } { urls = [ "https://nur-update.nix-community.org/" ]; response_string_match = "NUR update endpoint"; - tags.host = "build03.nix-community.org"; + tags.host = "web01.nix-community.org"; tags.org = "nix-community"; } { diff --git a/modules/secrets/rfc39_private_key.der b/modules/secrets/rfc39_private_key.der index 9db923142..e933f48a2 100644 --- a/modules/secrets/rfc39_private_key.der +++ b/modules/secrets/rfc39_private_key.der @@ -3,28 +3,28 @@ "sops": { "age": [ { - "recipient": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFiozp1A1+SUfJQPa5DZUQcVc6CZK2ZxL6FJtNdh+2TP", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHczV0xmQSAxVXcr\nZDY5dkx3Y1pGeU94WEdaTXFMWlZScU9lUHBFVElqRm9TcUc2WWhZCjVqUUNZMHdn\nalljUjV2WmhIbHFwdDI1K2VKVjVtVlJML2JtS2FQa0FGYU0KLS0tIHByNXRCOHYz\nNE1KZnduVFFtU1p4cmZSTGdHUVg1K1Uwd2I5NjJBZ1FnSDgKgFCPkKEyOzao9M3X\nN/doaJb0f2DYnxl+v2SfuUqvpkI09mJc2fxQ6LJBKKKkASMiYhiygaO2f/QApe1f\n/Cfnpw==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILAkBZMRNgsJ/IbLtjMHqBw/9+4tyn9nT+5B5RFiV0vJ", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG1lemEyZyBIaHdX\nL1J2dmNKamRUWTFKQWViTEVyaU1tNVRqWjhyU3E0UFpXVEcwOGlzCjJGekdmRGJ3\nMno3K0RPS1B0eUNaZFFTY2J1T3RNWTYrU29ySHFsVVplN0UKLS0tIEVBRWNvVWFu\nNmkrbW8vc0N2K245VkJZRTMwSFAzSlBKd3JrTm9lZ2w3U0UKdURZiGi3c22TUcwn\nIWmcRZqgnZLrWAg2Zv42QGyVIC2djnG+9oj47i16TxJg3JpQP7V2USqkDOsuVhJ5\nkSUAtA==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1dzvjjum2p240qtdt2qcxpm7pl2s5w36mh4fs3q9dhhq0uezvdqaq9vrgfy", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnaDl4OXpINUdTSVkzQnE1\naStNN25zYzZIaEd3ZnJzZEV2ZHI4RnlQMW5ZCmhZdDFjUkUycHEwemd4b1VqN3BM\nYkdnQ0FhSXJ4aXVTVDVhTjM4U0JxRjgKLS0tIEw0SnY3MFRyLzhDOGxEemUrdGpN\nYnE3SFJSR3h2dGdhZE5ETVFXb0EwUmMKRdF3RHdH3CcMb9RixvTaQfjTbgMSdLRh\nXvmzTGcPQU5Gj73eWJ9TVSRk4Mn6Z+b5JFfR6gO5+4ArhsGrNnQ5qg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMOVQwVmNqZ2Q3Ryt6S2hp\nSEFLRCsrTC93bTBkeGltNHJla2t1Q1VzYlh3CnN4WGVQNjZ6VkhmWmVMdUx4OHFS\nWjVCSDlueUlxWGZqSnVycDFxWW5TZjQKLS0tIDZBQUVNNlNZVDZNY1dzZHRadVBz\nZXp6cFEya1pPeW9yeW8vTU1uQlNJZmMKqXnSQC45ySmpq/yeEF93GZDlUawCTmLR\n/9fxCRydyGKPfG92WlDmRd7ogHkwFWr0K1d2QzK36kpy+i/XXs2f2Q==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4dFplOHMwNHQrbXVVVDYz\nQkFOQ1B2dkNBcHprbTVHU212ODM4bS91YzNnCm0zVExBM1VzYWI1cmFOU3VtMkty\nelFKV1g0N2d0dFJQMWZUeWhrNXZGU2sKLS0tIHA2NW5YckJ2TnArdE9EMlBPdHZN\nSWFMSS9xYnBVWFMrZVFjb0tja2piTlUKj7m8LCsnljseedMwHQ519aCOk6/mqCfn\nV2Zu6BurjlfVqEZC3AlsCIcCq2nudWGOcX/DzuyB87Cofqrx82rONA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYVEVlWlA4bDJJaDg2WTBO\naVUzc2VBalhkSVNqMXdvYWVISXJEeUxsSFcwCmJ1RklLbkVSUGhtdHUxajNwYkg4\nTTRvS3NLWlpuelVSbG84UHpkQVk5dmMKLS0tICtKN3hkMHM5VXVpYXNaVm84TjNk\nc3VpK1k2M3pvc3o5YTlyaHNUZkFwQ0EKYBkYSZqcgyEa9Ya2g4c/5B/vNc3vwYrf\nCNYw+L33v5TgRvYxJuz9N3R4ceWSe4q9YYDq5QDEBGI4/z2R3xY6ZA==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1d87z3zqlv6ullnzyng8l722xzxwqr677csacf3zf3l28dau7avfs6pc7ay", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKU3luQktmWUxMbTUyTUxP\nNGZJaFdFM0k3SFdyUnlDT3Nob2dpcHUvY2dBCmZGdnFJbUhhSGZRWVFUcTJLS3hz\nakVzNlhLRUxpWm9KSWU2T2orUFNOZlUKLS0tIGZDaitKenZLbmdidnF1ZDlJdStw\nQXJad280eGhFTUpwS1RHbUJlTzlud1EKS9QTD+M2SqXnaTFXoxCKpKO1Rdxcxlbf\nJ8xiF7YDbLm/XRsYqln9gOwNaOJl5KJ3/i8iIVQeL+3YljGHkIsg3g==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2NjFxTHpXV0lETjYwL2Q3\nSzR5d2hKc1NkV0o1eXI3RGhHQlpnNjl0dVdzCjZ0SlNZMW5uWFN0anlxOHRzSmNj\nQm1rRGp5MEpvbFBnMEc4dmhFdk9rMUEKLS0tIDY5QURuWnFidDZ4L0hOZ1Y4NmRl\nakdmS1dYd1czaUg5OFJpN2FtTlFIYncKONntze5TGfkL5WaVzEFEbb/ZCc4CFvoU\nInHXJ4azZU6oBepOcZxw9moaN7ry76qf5zcR3Ms13xhVxASQZTyFWg==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1jrh8yyq3swjru09s75s4mspu0mphh7h6z54z946raa9wx3pcdegq0x8t4h", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3Z1dqSXZLK1BiOFpGeCtP\nWlk0R1FDYjVzZWxPUGU1d2EyZW5QV0RkWGljClFncUxJQ0dHSWowb2I4N1d1bWdW\nSFY2ejhsMkFIaVJiSkpuZjh1YVZ4dVUKLS0tIFo4QmxaTk9RS2xqVXh3RlNMMHQ5\nUjZOdmR1cmJGd2paM1VkQUtBUjVXRW8KNCOd8n34H+q1+uWix6GzscZf8f0hoMgN\n8QVgL8SXrq+efXdr+oLvW1yicY3kKw+nhkfdeCgj85ZfHttli0nvBw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwNURkbXlJSjF5QjB1VExX\nTjAzNm5BYUNEUHVPSDcrc0hkWkFFVGVVd1NVClYvUGVKajNpVXFIVStmWndNRUFk\nVHFTTnd3Qmp5SmloMmRVZUtxb1lnN0EKLS0tIFdpWlV3R1NSc0RVNTBmeWsxOFM5\nWmZIVXJ6YkdWdFU4RTdTeVhWeWo3bnMKWIQT8ye+DUe0ibNBaKWjWTyxFn2ylPkM\nI6LCpT94FYsP8FkEJ6g5VkFADvmwkzdPlZ1mdXCXt0BsFSyEtJQg2A==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1m7xhem3qll35d539f364pm6txexvnp6k0tk34d8jxu4ry3pptv7smm0k5n", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvT3E0SEZuc1Y0Q2FoNTlY\nUVZ5WFVoU0JYalMzVTVzcUg3c2dlNldGWWdrCitQbHZ5TXpQWEdaYVZERTV5RmdH\nck9iek5Jc2FQMEdwTkFpZCtBRWtBOW8KLS0tIG9NM0FVQ0d4RnhTSEJHeTJLeG5n\nU2ZDUzVCcTZIVEVQTnpsdnNaL1VBNFUKCHxXzNs9HX6r7Y+wHwzM+D6Z4ztt35C8\nhKRjmcSWPNpP9Nu3q+qOk8VRK7ZU1HWQvQafmSJ7QVeT2tWnt5sA/w==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0Z29lWjhqd3lpTUcyclkv\nZkMxdExEbU82NGpsUFBlYXltamxvdDFMOG5JCnY4UGVUaklESVJ6RE1mdGtveUJR\na210QjdBc3RSUFZvc0VTSHBvREpmRDAKLS0tIHJBWlE4Uk9ITVhMWWxGTVZ6Q00z\nQUt5N0dGK2U0blR4THVQUHdDSklYZzQKabgj0bcEw5hDS6wM6Pgx8/vGzg4ZEwxs\n9m8LpHhQur12b5V+bJDu0iSH9ej8SR2ZZKPtQ3HMqmEzfnkktM7YZQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-05-19T23:56:18Z", diff --git a/sops.nix b/sops.nix index 57ff0f60f..e9e04725a 100644 --- a/sops.nix +++ b/sops.nix @@ -42,7 +42,7 @@ let "darwin02" ]; "modules/secrets/rfc39_private_key.der" = [ - "build03" + "web01" ]; } // builtins.listToAttrs (