From 8b11f2e04ca364a2695d489af5661e22026e5ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Tue, 26 Apr 2022 07:36:17 +0100
Subject: [PATCH] fix eval error*2

---
 config/services/mastodon.nix | 44 ++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/config/services/mastodon.nix b/config/services/mastodon.nix
index 30f40cd0..1da7f29c 100644
--- a/config/services/mastodon.nix
+++ b/config/services/mastodon.nix
@@ -46,28 +46,34 @@ in
   sops.secrets."services/mastodon/vapid/private" = sopsConfig;
   sops.secrets."services/mastodon/vapid/public" = sopsConfig;
 
-  services.nginx.virtualHosts."mastodon.chir.rs" = {
-    root = "${config.services.mastodon.package}/public/";
-    sslCertificate = "/var/lib/acme/chir.rs/cert.pem";
-    sslCertificateKey = "/var/lib/acme/chir.rs/key.pem";
-    locations."/system/".alias = "/var/lib/mastodon/public-system/";
+  services.nginx.virtualHosts =
+    let mastodon = {
+      root = "${config.services.mastodon.package}/public/";
+      locations."/system/".alias = "/var/lib/mastodon/public-system/";
 
-    locations."/" = {
-      tryFiles = "$uri @proxy";
+      locations."/" = {
+        tryFiles = "$uri @proxy";
+      };
+      locations."@proxy" = {
+        proxyPass = (if config.services.mastodon.enableUnixSocket then "http://unix:/run/mastodon-web/web.socket" else "http://127.0.0.1:${toString(config.services.mastodon.webPort)}");
+        proxyWebsockets = true;
+      };
+      locations."/api/v1/streaming/" = {
+        proxyPass = (if config.services.mastodon.enableUnixSocket then "http://unix:/run/mastodon-streaming/streaming.socket" else "http://127.0.0.1:${toString(config.services.mastodon.streamingPort)}/");
+        proxyWebsockets = true;
+      };
     };
-    locations."@proxy" = {
-      proxyPass = (if config.services.mastodon.enableUnixSocket then "http://unix:/run/mastodon-web/web.socket" else "http://127.0.0.1:${toString(config.services.mastodon.webPort)}");
-      proxyWebsockets = true;
+    in
+    {
+      "mastodon.chir.rs" = mastodon // {
+        sslCertificate = "/var/lib/acme/chir.rs/cert.pem";
+        sslCertificateKey = "/var/lib/acme/chir.rs/key.pem";
+      };
+      "mastodon.int.chir.rs" = mastodon // {
+        sslCertificate = "/var/lib/acme/int.chir.rs/cert.pem";
+        sslCertificateKey = "/var/lib/acme/int.chir.rs/key.pem";
+      };
     };
-    locations."/api/v1/streaming/" = {
-      proxyPass = (if config.services.mastodon.enableUnixSocket then "http://unix:/run/mastodon-streaming/streaming.socket" else "http://127.0.0.1:${toString(config.services.mastodon.streamingPort)}/");
-      proxyWebsockets = true;
-    };
-  };
-  services.nginx.virtualHosts."mastodon.int.chir.rs" = config.services.nginx.virtualHosts."mastodon.chir.rs" // {
-    sslCertificate = "/var/lib/acme/int.chir.rs/cert.pem";
-    sslCertificateKey = "/var/lib/acme/int.chir.rs/key.pem";
-  };
   services.redis.servers.mastodon = {
     enable = true;
     bind = "127.0.0.1";