Merge remote-tracking branch 'prism/master'

2 files changed, 17 insertions, 3 deletions

diff --git a/makefu/2configs/binary-cache/gum.nix b/makefu/2configs/binary-cache/gum.nix
new file mode 100644
index 000000000..fc54bd917
--- /dev/null
+++ b/makefu/2configs/binary-cache/gum.nix
@@ -0,0 +1,13 @@
+
+{ config, ... }:
+
+{
+  nix = {
+    binaryCaches = [
+      "https://cache.euer.krebsco.de/"
+    ];
+    binaryCachePublicKeys = [
+      "gum:iIXIFlCAotib+MgI3V/i3HMlFXiVYOT/jfP0y54Zuvg="
+    ];
+  };
+}
diff --git a/makefu/2configs/binary-cache/server.nix b/makefu/2configs/binary-cache/server.nix
index ad6256830..c8f68c84d 100644
--- a/makefu/2configs/binary-cache/server.nix
+++ b/makefu/2configs/binary-cache/server.nix
@@ -19,9 +19,10 @@
   };
   services.nginx = {
     enable = true;
-    virtualHosts.nix-serve = {
-      serverAliases = [ "cache.gum.r"
-                        "cache.euer.krebsco.de"
+    virtualHosts."cache.euer.krebsco.de" = {
+      forceSSL = true;
+      enableACME = true;
+      serverAliases = [ # "cache.gum.r"
                         "cache.gum.krebsco.de"
                       ];
       locations."/".proxyPass= "http://localhost:${toString config.services.nix-serve.port}";