From 7bcd116cc32dc76dbd03e72d06ddcb095fdc2d18 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 22 Mar 2020 23:50:46 +0100
Subject: ...

---
 custom/ymir-nginx.nix | 2 +-
 ymir.nix              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index 066320c3..a001d703 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -25,7 +25,7 @@ let
 
   acme = builtins.toFile "acme" ''
     location /.well-known/acme-challenge {
-      root /srv/www/acme/$host/;
+      root /srv/www/acme/;
     }
   '';
 
diff --git a/ymir.nix b/ymir.nix
index 1d9a0b86..417850f2 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -840,9 +840,9 @@ in rec {
       "yggdrasil.li" = {
         allowKeysForGroup = true;
         group = "ssl";
-        webroot = "/srv/www/acme/yggdrasil.li";
+        webroot = "/srv/www/acme";
         email = "phikeebaogobaegh@141.li";
-        extraDomains = builtins.listToAttrs (builtins.map (name: { inherit name; value = "/srv/www/acme/${name}"; }) myDomains);
+        extraDomains = builtins.listToAttrs (builtins.map (name: { inherit name; value = null; }) myDomains);
         postRun = ''
           systemctl reload nginx.service dovecot2.service postfix.service prosody.service vsftpd.service infinoted.service
         '';
@@ -852,7 +852,7 @@ in rec {
 
   systemd.services."acme-yggdrasil.li".requires = [ "nginx.service" ]; 
   systemd.tmpfiles.rules
-    = let mkDir = domain: "d /srv/www/acme/${domain} 0775 root ssl 10d -";
+    = let mkDir = domain: "d /srv/www/acme 0775 root ssl 10d -";
        in map mkDir myDomains;
 
   services.uucp = {
-- 
cgit v1.2.3