Compare commits

..

1 Commits

Author SHA1 Message Date
731cfce080 Full CI 2023-11-17 18:35:54 +00:00
6 changed files with 7 additions and 3 deletions
.gitea/workflows
.keys
nixos/boxes/colony/vms
estuary
shill/containers
secrets.nix

@ -30,7 +30,7 @@ jobs:
- name: Check and build flake - name: Check and build flake
id: build id: build
run: | run: |
nix flake check # nix flake check
path=$(nix build --no-link .#ci.x86_64-linux --json | jq -r .[0].outputs.out) path=$(nix build --no-link .#ci.x86_64-linux --json | jq -r .[0].outputs.out)
echo "path=$path" >> "$GITHUB_OUTPUT" echo "path=$path" >> "$GITHUB_OUTPUT"

1
.keys/ci.pub Normal file

@ -0,0 +1 @@
age1ythn9runhsvwmszqfy69zetc422hug39ta4g236tue6f5qf65y0q4qg7xx

@ -448,7 +448,7 @@ in
chain forward { chain forward {
iifname { wan, $ixps } oifname base jump filter-routing iifname { wan, $ixps } oifname base jump filter-routing
oifname $ixps jump ixp oifname $ixps jump ixp
iifname base oifname { base, wan, $ixps } accept iifname base oifname { wan, $ixps } accept
oifname { as211024, kelder } accept oifname { as211024, kelder } accept
} }
chain output { chain output {

@ -412,6 +412,7 @@ in
nixCacheableRegex = ''^\/(\S+\.narinfo|nar\/\S+\.nar\.\S+)$''; nixCacheableRegex = ''^\/(\S+\.narinfo|nar\/\S+\.nar\.\S+)$'';
nixCacheHeaders = '' nixCacheHeaders = ''
proxy_hide_header "X-Amz-Request-Id";
add_header Cache-Control $nix_cache_control; add_header Cache-Control $nix_cache_control;
add_header Expires $nix_expires; add_header Expires $nix_expires;
''; '';
@ -447,6 +448,7 @@ in
}; };
}; };
useACMEHost = pubDomain; useACMEHost = pubDomain;
onlySSL = false;
}; };
}; };

@ -162,7 +162,7 @@ in
type = "s3"; type = "s3";
region = "eu-central-1"; region = "eu-central-1";
bucket = "nix-attic"; bucket = "nix-attic";
endpoint = "https://s3.nul.ie"; endpoint = "http://localhost:9000";
}; };
chunking = { chunking = {
nar-size-threshold = 65536; nar-size-threshold = 65536;

@ -9,6 +9,7 @@ let
defaultKeys = [ defaultKeys = [
(fileContents .keys/dev.pub) (fileContents .keys/dev.pub)
(fileContents .keys/ci.pub)
]; ];
secretKeys = secretKeys =
zipAttrsWith zipAttrsWith