sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nixpkgs-update: use harmonia for cache instead of cachix

Browse source
This commit is contained in:
zowoq 2024-12-18 13:40:14 +10:00
parent 36a9be1663
commit 6528e6f959
6 changed files with 42 additions and 20 deletions

1
flake.nix
View file

@ -147,6 +147,7 @@
nixosTests-buildbot = pkgs.nixosTests.buildbot;
nixosTests-buildbot-nix-master = inputs'.buildbot-nix.checks.master;
nixosTests-buildbot-nix-worker = inputs'.buildbot-nix.checks.worker;
nixosTests-harmonia = pkgs.nixosTests.harmonia;
nixosTests-hydra = pkgs.nixosTests.hydra.hydra;
};
};

1
hosts/build02/default.nix
View file

@ -3,6 +3,7 @@
{
imports = [
./nixpkgs-update-backup.nix
./nixpkgs-update-cache.nix
./nixpkgs-update.nix
inputs.self.nixosModules.cgroups
inputs.self.nixosModules.disko-zfs

25
hosts/build02/nixpkgs-update-cache.nix Normal file
View file

@ -0,0 +1,25 @@
{ config, ... }:
{
# nixpkgs-update-cache.nix-community.org-1:U8d6wiQecHUPJFSqHN9GSSmNkmdiFW7GW7WNAnHW0SM=
sops.secrets.harmonia-key = { };
services.harmonia = {
enable = true;
signKeyPaths = [ config.sops.secrets.harmonia-key.path ];
};
services.nginx.virtualHosts."nixpkgs-update-cache.nix-community.org" = {
locations."/" = {
extraConfig = ''
proxy_pass http://127.0.0.1:5000;
proxy_set_header Host $host;
proxy_redirect http:// https://;
proxy_http_version 1.1;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
'';
};
};
}

6
hosts/build02/nixpkgs-update.nix
View file

@ -262,12 +262,6 @@ in
group = "r-ryantm";
};
sops.secrets.nix-community-cachix = {
path = "/var/lib/nixpkgs-update/worker/cachix/cachix.dhall";
owner = "r-ryantm";
group = "r-ryantm";
};
# autoindex is truncated on some browsers
services.nginx.recommendedZstdSettings = false;

8
hosts/build02/secrets.yaml
View file

@ -1,7 +1,7 @@
github-r-ryantm-key: ENC[AES256_GCM,data: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,iv:Qg8SdZVOeOA1rHt/CCo1Fj9sqUvq5zhaetboYUIe2co=,tag:UNGFeWqBY46lK6/cEr4/Kg==,type:str]
github-r-ryantm-token: ENC[AES256_GCM,data:X77cQQQDFcUe9VcHZwbhZdyg6wFsAEwRMDaDojWYyHJf4RxWwRm8Vg==,iv:/PxtdHM1eTbRZb0KrjuSSutxBVwmFaSejp62qb+/D10=,tag:K/EH8Rl6CeZcigftKO3hNw==,type:str]
github-token-with-username: ENC[AES256_GCM,data:H1ek0++8fx4fIcxLZMe/fphuHmR3FHDGT0W+IJ4LXme0dgoD+S/uW+oLL7LEpb2lkMv5ZxGu,iv:TmWriUuA2l6L4tzMfisvtBRd5JsFgIAsSbNN7C/MExI=,tag:90L26NPokbG/xxQ37xf6Bg==,type:str]
nix-community-cachix: ENC[AES256_GCM,data:G/W/xi/bOfZcy6RL3ngOP0wWbz90s7d/4tFn2YR0ELxVPYCSHXNkkQRebLBtA5b4WCtbtMMI4Wnm8N4MtzLz8bAjoYxQ3vaimXIQrU4+d4Jj8GudNFGXtwP5P3i3G8Xq2fcHXvO5uhJAU+1nGAr8h2GmkW12pzohKp3kvGAc/T+sJ817pb35GyAfTmj5KmGc2H4vhkQ9MzbyhDpmDHwYEEDIfbtbk498ZTiRZnnAJ6D7dPH6CoLJbRqFa+LARgPYfVeO23xAhU4ahDiuup3QDmK3MlEpiUgywBqyn8QuvT5xHwvxgxat5kJsXARVepCPLi78Om02irn8m3ut2Yqxim7YBJ46pBM=,iv:trBlh1LBruagdwHM04l2xHGxvamPinFT4XRaJhqsuys=,tag:39tQ1M7Kd58U1+OozYrV9A==,type:str]
harmonia-key: ENC[AES256_GCM,data:spF0umMitWXKQGo5YhiF34LiYFdnYN0a3DZSwDT/lD+4CK2K/hHk1FvXsw973sLQzkZmqpU4UfgTpAY4uiIsr38LZbxdYRt+pFPzTuphfCudUD4dIaKhl/T7F+s3QjPTdcoWyIPQBKoX6JAFNpC4nIfHvdHCdZZLU/BJT+3YdLsE0w==,iv:+pUDHANiEj+zUOn8kzaFwxV2YW5EYP+OyaeIDsYClqU=,tag:y4ZiPrPztRq+4zlSexxF9Q==,type:str]
sops:
kms: []
gcp_kms: []
@ -62,8 +62,8 @@ sops:
blYxOTlvUXRIZVR1bFByOXlWRFdGbnMKX2tfgtOnWMm8g4tCPeO3/poTkncZUCoS
MrBJuCFYJJUUwwvu/1Whyv2WNE0uenaa+fe5kade0vO8Ke2OPfxVfA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-07-25T02:42:23Z"
mac: ENC[AES256_GCM,data:uym0MqNmDWWjBhswcgk7lnIjys07wWBqJufvBop2vQ4NnC5l2NJLyC4JyGoLbhciLjQxmd8M9xVMnp9luciH7YWheH2u4T6KG6AHryRlTQ8TAY1JwnkNCoDHEvEsCvmVCUpIwBhxEX6HEQiQQ7SNd4nJRdFcCmLiOvPV+SOcHZ0=,iv:NAFlX1vh3xPRJdWRki3/rId7KZ3DpI2sw4yQFzFheN8=,tag:T5cHmyptmZTO2riCGVCpkw==,type:str]
lastmodified: "2024-12-18T09:52:39Z"
mac: ENC[AES256_GCM,data:JjvII6cDN9WkHXbFPP2Ol9cwEMRo1XW8BKpqhlbACRo4BnkPXq5l8MJMdKV/7fMON/Ncp+HSMvlJgNKv5PF2tbvQlmkI7XQCJKXZyqkcHQg+6IPcaYGtT0PJgACcKUA2lm4gERskj/O/V6W64ottdzDHS6vGk7mzR254A5GTox0=,iv:ftsNlCw3VDGBF4svqqfcG3/GIz+rznPzF3SIi+rs/YI=,tag:Zb+HoY/7VPXd9JUZco1v1w==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.9.0
version: 3.9.2

21
terraform/cloudflare_nix-community_org.tf
View file

@ -38,16 +38,17 @@ locals {
}
cname = {
"alertmanager" = "web02.nix-community.org"
"build-box" = "build01.nix-community.org"
"buildbot" = "build03.nix-community.org"
"darwin-build-box" = "darwin01.nix-community.org"
"docker" = "zimbatm.docker.scarf.sh" # Used by nix-community/nixpkgs-docker
"grafana" = "web02.nix-community.org"
"hydra" = "build03.nix-community.org"
"nixpkgs-update-logs" = "build02.nix-community.org"
"nur-update" = "build03.nix-community.org"
"prometheus" = "web02.nix-community.org"
"alertmanager" = "web02.nix-community.org"
"build-box" = "build01.nix-community.org"
"buildbot" = "build03.nix-community.org"
"darwin-build-box" = "darwin01.nix-community.org"
"docker" = "zimbatm.docker.scarf.sh" # Used by nix-community/nixpkgs-docker
"grafana" = "web02.nix-community.org"
"hydra" = "build03.nix-community.org"
"nixpkgs-update-cache" = "build02.nix-community.org"
"nixpkgs-update-logs" = "build02.nix-community.org"
"nur-update" = "build03.nix-community.org"
"prometheus" = "web02.nix-community.org"
}
}