Merge branch 'master' of git.yggdrasil.li:nixos

1 files changed, 7 insertions, 2 deletions

diff --git a/ymir.nix b/ymir.nix
index e668ecfc..42a75439 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -13,6 +13,7 @@ let
       cert = "certs/${name}.crt";
     };
   };
+  simp_le = pkgs.callPackage ./custom/simp_le.nix {};
 in rec {
   imports =
     [
@@ -128,7 +129,11 @@ in rec {
   services.fcron = {
     enable = true;
     systab = ''
-      %weekly * * nix-collect-garbage --delete-older-than '7d'
+      %weekly  * *   nix-collect-garbage --delete-older-than '7d'
+      %monthly,jitter(300) * * * ${simp_le "/etc/nginx/ssl/git.yggdrasil.li" "git.yggdrasil.li"}
+      %monthly,jitter(300) * * * ${simp_le "/etc/nginx/ssl/dirty-haskell.org" "dirty-haskell.org"}
+      %monthly,jitter(300) * * * ${simp_le "/etc/nginx/ssl/www.dirty-haskell.org" "www.dirty-haskell.org"}
+      %daily   * *   systemctl reload nginx.service
     '';
   };
 
@@ -235,7 +240,7 @@ in rec {
       readme=:readme.txt
       readme=:readme
 
-      clone-url=git://git.yggdrasil.li/$CGIT_REPO_NAME http://git.yggdrasil.li/$CGIT_REPO_NAME
+      clone-prefix=git://git.yggdrasil.li http://git.yggdrasil.li
 
       strict-export=git-daemon-export-ok
       project-list=/srv/git/projects.list