From 6cb7fb16a1e4b9a70fc4668dd1c9db19a3ea1c5c Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Wed, 19 Apr 2023 17:49:09 +0200
Subject: [PATCH] l binary-cache: split into server & proxy, add neoprism
---
lass/1systems/prism/config.nix | 1 +
lass/2configs/binary-cache/client.nix | 1 +
lass/2configs/binary-cache/server.nix | 10 +---------
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 2e82fae6f..e1f92c51e 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -127,6 +127,7 @@ with import <stockholm/lib>;
<stockholm/lass/2configs/exim-smarthost.nix>
<stockholm/lass/2configs/privoxy-retiolum.nix>
<stockholm/lass/2configs/binary-cache/server.nix>
+ <stockholm/lass/2configs/binary-cache/proxy.nix>
<stockholm/lass/2configs/iodined.nix>
<stockholm/lass/2configs/paste.nix>
<stockholm/lass/2configs/syncthing.nix>
diff --git a/lass/2configs/binary-cache/client.nix b/lass/2configs/binary-cache/client.nix
index b0e0a8b88..de15aff92 100644
--- a/lass/2configs/binary-cache/client.nix
+++ b/lass/2configs/binary-cache/client.nix
@@ -4,6 +4,7 @@
nix = {
binaryCaches = [
"http://cache.prism.r"
+ "http://cache.neoprism.r"
"https://cache.nixos.org/"
];
binaryCachePublicKeys = [
diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix
index 30bef5137..bdd568c15 100644
--- a/lass/2configs/binary-cache/server.nix
+++ b/lass/2configs/binary-cache/server.nix
@@ -14,7 +14,7 @@
services.nginx = {
enable = true;
virtualHosts.nix-serve = {
- serverAliases = [ "cache.prism.r" ];
+ serverAliases = [ "cache.${config.networking.hostName}.r" ];
locations."/".extraConfig = ''
proxy_pass http://localhost:${toString config.services.nix-serve.port};
'';
@@ -26,14 +26,6 @@
''};
'';
};
- virtualHosts."cache.krebsco.de" = {
- forceSSL = true;
- serverAliases = [ "cache.lassul.us" ];
- enableACME = true;
- locations."/".extraConfig = ''
- proxy_pass http://localhost:${toString config.services.nix-serve.port};
- '';
- };
};
}