summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-01-13 05:02:51 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2016-01-13 05:02:51 +0100
commit2bb6ed38d2b0e28741a498c64777a5f20eb7af97 (patch)
tree16c5516a73385dc23b2b63c69e4a9a29a196fcc1
parentbbf645567711d949b17fbaf1b52ff8a03ca16f36 (diff)
downloadnixos-2bb6ed38d2b0e28741a498c64777a5f20eb7af97.tar
nixos-2bb6ed38d2b0e28741a498c64777a5f20eb7af97.tar.gz
nixos-2bb6ed38d2b0e28741a498c64777a5f20eb7af97.tar.bz2
nixos-2bb6ed38d2b0e28741a498c64777a5f20eb7af97.tar.xz
nixos-2bb6ed38d2b0e28741a498c64777a5f20eb7af97.zip
Reverted experiments with simp_le
-rw-r--r--custom/simp_le.nix18
-rw-r--r--ymir.nix2
2 files changed, 0 insertions, 20 deletions
diff --git a/custom/simp_le.nix b/custom/simp_le.nix
deleted file mode 100644
index 659adef5..00000000
--- a/custom/simp_le.nix
+++ /dev/null
@@ -1,18 +0,0 @@
1{ domains ? []
2, simp_le
3, lib
4, writeText
5}:
6
7let
8 getcert = domain: ''
9 date=$(date -u +'%Y-%m-%d')
10 mkdir -p /etc/ssl/${domain}/$date /srv/www/acme/${domain} || exit 1
11 cd /etc/ssl/${domain}/$date || exit 1
12 ${simp_le}/bin/simp_le \
13 -f cert.pem -f key.pem -f fullchain.pem -f account_key.json \
14 --email phikeebaogobaegh@141.li \
15 -d ${domain}:/srv/www/acme/${domain} \
16 && ln -fs /etc/ssl/${domain}/$date /etc/ssl/current
17 '';
18in writeText "certs.sh" (lib.concatMapStringsSep "\n" getcert domains)
diff --git a/ymir.nix b/ymir.nix
index c844834c..d7c862ef 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -130,8 +130,6 @@ in rec {
130 enable = true; 130 enable = true;
131 systab = '' 131 systab = ''
132 %weekly * * nix-collect-garbage --delete-older-than '7d' 132 %weekly * * nix-collect-garbage --delete-older-than '7d'
133
134 %monthly * * * ${pkgs.bash}/bin/bash ${pkgs.callPackage ./custom/simp_le.nix { domains = ["dirty-haskell.org" "www.dirty-haskell.org" "git.yggdrasil.li" "git.dirty-haskell.org" "git.141.li"]; } } 2>&1 | ${pkgs.eject}/bin/logger -p auth.info
135 ''; 133 '';
136 }; 134 };
137 135