Revert "nur-update: build03 -> web01"

This reverts commit 0fe327b.
nix-community · Nov 12, 2023 · a668626 · a668626
1 parent 357f5f3
commit a668626
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/hosts/build03/configuration.nix b/hosts/build03/configuration.nix
@@ -23,6 +23,7 @@
 
     inputs.self.nixosModules.github-org-backup
     inputs.self.nixosModules.hydra
+    inputs.self.nixosModules.nur-update
   ];
 
   services.postgresql.package = pkgs.postgresql_12;

diff --git a/hosts/build03/secrets.yaml b/hosts/build03/secrets.yaml
@@ -1,6 +1,7 @@
 ssh_host_ed25519_key: ENC[AES256_GCM,data:FFHBBUVBMU/nqglYgKpzS+H1O/bIc7zBUfOf20TmLxOjz4qCtwfPsKI3h5pUVZtlmZYh8oBHGDENYdGeoJDOrXmDHKuSv96gVeQ+78F0C0JTPHHYuZeWTCXxgIJHuwLTLkuf3Q6ziClnKPaLnHXnKZ+nMgJ9U2ZhJ1TuQuLpCmkybG6jTH7Km3mqDAuBPU1gmIm5VQ3ooDhFTUmC0PmHDvrpKNY4tbtmYrs/8hchVg2jZh7P/ZBmyu0Pzehuijfzal64OEj5WqqgWal/icgMSq785r5FhtbzW44ZtLFDcFBAhoqtCHG9je2+HX7A8W5xCADxNac1FWKFDdJf7nIZmbhRZ6qemoZC4QpaByM1+ZXMZotjnQDlCJ3swWYN7St4zOirm/Hs/k6L3g6SuVwUMSnGaZMGMMd1lcVY9Gfll5CfSqkvGPyYrGpINSzX4UdXZVfM7wLSPvpDl95Y3GeRYVzNp1NCjyeYLIDtshNRYC6mkakBc1Eu89yULU04TAYjdKf+DX4h5buIQu4SWME6OSzPlvfw5CeDNOQVXdmXMs9rong=,iv:+bSiR0HSQzSu5ZWIW7VeLERr+sWcnfx5j6O4ImQdhF8=,tag:KFQwC3giekzexvJfoU22YQ==,type:str]
 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]
+nur-update-github-token: ENC[AES256_GCM,data:KIZCx9IeuBHZei2V13iiyHzCedhkkGEd08mVJEc6F0DWQn1wtzC7+w==,iv:pNVRj/RR7wj64g640F7Vo4H10ijsxnrfFQnt6YHBug4=,tag:UlvOMNB5JZbuJaD9TcJ2UQ==,type:str]
 hydra-users: ENC[AES256_GCM,data:askAB+a3bsFvue/j9i6sYSwgOQl+rL+uh+1+z+xizzBOWdTZcvRh5uFHTkg7MV/E7tG7eRByQ7b+v/onJ4+l3rGJJ6qsWtLLLizC1rusngsAXyI9jt66eqpsyacN5kw8cKILjGearptrhUZDWdKpbaHII6fwUbWbjyV5fpoQzNmI4VELWEQMZ50yECfAfCLHx9iTdoMJHPXzhqwvAZ+TbX6TsyqbDrrNauYWNUBhCK7E2tDYAQqOGhxnQWI+gQs=,iv:Baqyd/WfloMuXTiICD2dlvENst8G6YU9rSHdRkTECkU=,tag:z4j5dYcba3aZTyWu5wvkzw==,type:str]
 hetzner-borgbackup-ssh: ENC[AES256_GCM,data:ZNrQp36c3EuERlAYez6SHTLbHK7ZmLNqDpAffTTQARL2zpnjpw1wJQJdm6d6Un1wTjYmHMJ/f1jCKgn389FGiZJwxSLUL4Ko2n5HffBTjZwTeqE1y4XFe6qvAY/LYBmD728ZWOsSWPvoVZOm1dG7LsxxwUZWk2VyDtvODuJBInn19Dn7Tw5VqPjJMJAp5CfAaW8ilEPpdeG0JQfkJkBQj0+pMlpI1EIVDvdZai5fesweUWeaajrPnIjrBbqdFvd8eG9qrTehLM7FvpnT2qllfsCOeQf/KTPEw16I6eGFFm22iPblJgHFPzpu1a2Lvwn+8HcwqSMlGI9poOeV5RwXqBhFX9vozlN8G82csAnehiZmLktyYin1kYF3nfOXFqH9fKxbvXn/1hxQP//GDeoaNlepa/K/w51pj1mgbIXIb5g/PKsHaC7Rv3iDMcYW977+lobA4WnxfWhjA6k/iBb1unkSKbrZs+iHglpOKueAq9g6HO5fJ299eY2+GcmsPU3QKm4W,iv:550mzEValpqVruLQBMMJeJHVyYfaxNHwCvXkvz66qI0=,tag:k48T+9AtJs8GTVchyEP8Jw==,type:str]
 sops:
@@ -63,8 +64,8 @@ sops:
             WUZQSGQyQy9halJsRTIvb1FGV08zZEEKmjlYY6epTuZKRBcVyjPvJI5XKQtP5Yag
             FMrI+M6hUeyBeCade5C+Y4eGQbt57BWLmsX7u0J1WTlkUSS5j7+wPg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-09-15T00:19:34Z"
-    mac: ENC[AES256_GCM,data:7yDcBkK/0A66S7cd5VEYSOUFaRNgD7cq8IQUJM6qnvYO/2kCjecD27K/58jpFrgxrna2p0UUH5sOt61aZLX37eBkTmnyfh99lAwshZA80/vbEwIgdAvjrYEz6X7e76C4qMhlPn+8/tiZXoJ3ULUot6t3jySm0ZD5kmwZJnr2ON0=,iv:X5KbtbByiU2mDvEOMENPZTWXbf+lUIyIfaMOdFiaLtQ=,tag:LN0BBnG+LnDhxpkPAiOjxw==,type:str]
+    lastmodified: "2023-07-21T12:58:43Z"
+    mac: ENC[AES256_GCM,data:zTImcUQeQsbWfWZjwJ6nPNCrYWkyUvZrud3pNWdsMLqXn0uB61n/Oav3i3m1zyz7eQObutG1OR+0aUlLMk0v7Xbz9rZCrMKN+GuV7tcaeu3ksvpn21ldd8PGzmYa6M+0EKkVqeTKXYHYY06OsxfeWafT52XA+0/uKE+3ldS2o3U=,iv:CSWcScdbdu+6lWt/6WFBBO8GqygNsKVNzII3bbxh8jg=,tag:tBwvCs0usPFBgoWRw3G5eQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/hosts/web01/configuration.nix b/hosts/web01/configuration.nix
@@ -6,7 +6,6 @@
     inputs.srvos.nixosModules.mixins-nginx
     inputs.srvos.nixosModules.hardware-hetzner-cloud
     inputs.self.nixosModules.common
-    inputs.self.nixosModules.nur-update
     ./samba.nix
     ./postgresql.nix
     ./pgbackrest.nix

diff --git a/hosts/web01/secrets.yaml b/hosts/web01/secrets.yaml
@@ -3,7 +3,6 @@ hetzner-cifs-lemmy-pict-rs-creds: ENC[AES256_GCM,data:dUcjS0az8d85WTLhaBGj2XT7zf
 hetzner-cifs-web01-pgbackrest: ENC[AES256_GCM,data:CITVeBayUoJCw2100uf2liIs1f/WtcBFemsEX+C85fie3D1ZB05pPw==,iv:rJnlxteLXwVhM1uhc8SK/1Ud96BM/HvToYopB3y2FPE=,tag:oB9wOXeiSVtSvUSKCu/67Q==,type:str]
 pictrs-env: ENC[AES256_GCM,data:OiqdnqmC7+DLKJDELnbkrEa4Rnx+x9uPtH02c1iwvXuSqmz3RweeIZOwJ/Ld4QXckiI8YR5jy+SyfsPp8aFUF+P/YgmR/VHfCYQxVo+4Zm23,iv:GwPbnpUbaOzs5jeY+MbTu1aKKqejCZWE2CVNWGjwjZM=,tag:z81OV2qDciO7pqAlTXEZeg==,type:str]
 lemmy-pictrsapikeyfile: ENC[AES256_GCM,data:82jdunQH0e/L5w5Zyq00SkVo+w9iwkrM0OQ6QDfwuS2KUQmsuSGzYAnehTZg8Ly+9L01WdFV8XNPPFBG0Fd/yag=,iv:xEIeMMEagJCEuTAXYUhUDyZc/mkXN8I93GnI2FKhDMU=,tag:YanLUqmW2pPFvqEw+dPIIQ==,type:str]
-nur-update-github-token: ENC[AES256_GCM,data:zdC2fg7xy8bPxLvXsqfvZlq2qv75UZG5M5SuFj/FYhD1GHOivCMPAQ==,iv:mExWTNfN22hHC5CpenDHx7O59wUYquSZBYR1My7DSP0=,tag:aIaeavC4/3ueb9nC88/vuA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -64,8 +63,8 @@ sops:
             bFFYZ0ZvUkU2RzI1Sk1EMXU3L2kzNXcKTNd6rP4vwBlxy0IOpvJkwD2DHEuygQQj
             6nP/LDINN6byq+SCUOO60r/dPDixmRDZdWnvkRIntVweSpSgoM9dSw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-09-15T00:19:46Z"
-    mac: ENC[AES256_GCM,data:Mx+ZVwe3MX35WUhAcHExAlMMAGrgg0jTZdfNRZuoYJXjJjW6E9Ri4GQOII6/CIfVrNZwAsfOt68Vv7dR8pxdFXvf5ZTXXN+bA0S17fnIxKFwFglRvylYl2Yrk9JQj6vR8urc8TlPbKoW99X4DgkibxCEXnpg63Esm4cUpkxODv8=,iv:jiFveXXbn5xLY8Hw0Wm+WG9P6opIyhicURD/HyfKBjA=,tag:5frGdeUFid+XBkvkwWghlg==,type:str]
+    lastmodified: "2023-07-29T00:47:36Z"
+    mac: ENC[AES256_GCM,data:gUPn4wVuAewpJvkt+UW3V+W2jAjvde22Bx5lBb1pdK99K+pcPwFS2rhaim+p0rzH3GimtS1vp6B5APajH8Y6ggroJTyQErpwZMWB7oQTGyPbJjBLF/+Kzx1ISCHGKQq/ZIsVI3CsPhW6HMbXPTPBDSZnaWP9TaAfriZz/fKSbvg=,iv:sxaHeaaHINOmw5DsxEfXEE7DjfBJGop8w+ARyv1/akE=,tag:IC1bYjtemxwWbLvuUqghUA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/modules/nixos/monitoring/telegraf.nix b/modules/nixos/monitoring/telegraf.nix
@@ -22,7 +22,7 @@
       {
         urls = [ "https://nur-update.nix-community.org/" ];
         response_string_match = "NUR update endpoint";
-        tags.host = "web01.nix-community.org";
+        tags.host = "build03.nix-community.org";
         tags.org = "nix-community";
       }
       #{

diff --git a/terraform/cloudflare_nix-community_org.tf b/terraform/cloudflare_nix-community_org.tf
@@ -191,7 +191,7 @@ resource "cloudflare_record" "nix-community-org-hydra-CNAME" {
 resource "cloudflare_record" "nix-community-org-nur-update-CNAME" {
   zone_id = local.nix_community_zone_id
   name    = "nur-update"
-  value   = "web01.nix-community.org"
+  value   = "build03.nix-community.org"
   type    = "CNAME"
 }