From 6852bbb9f37dc7d80e91925c999dab0e8fe6a494 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 22 Sep 2016 19:36:20 +0200
Subject: [PATCH] redirect to yorickvanpelt.nl

---
 packages/yori-cc.nix         | 10 +++++-----
 pennyworth/configuration.nix | 12 +++++++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/yori-cc.nix b/packages/yori-cc.nix
index 654e0e2..aa502ee 100644
--- a/packages/yori-cc.nix
+++ b/packages/yori-cc.nix
@@ -3,12 +3,12 @@ with import <nixpkgs> {};
 let gogitget = callPackage ./gogitget.nix {}; in
 
 stdenv.mkDerivation {
-  name = "yori-cc-1.1";
+  name = "yori-cc-1.2";
   
   src = gogitget {
-    url = "git@git.yori.cc:yorick/yori-cc.git";
-    rev = "b5ca927b1c725b4a674a73f546d010be739472ff";
-    sha256 = "3e4c25358d96b6fc3819b7b74e33c84de508c930910399784af2bd3a82c1f3bd";
+    "url" = "git@git.yori.cc:yorick/yori-cc.git";
+    "rev" = "6e73c0152a9e5b0109e714fb57ca0d401cbf27a1";
+    "sha256" ="1zmwl5rlbd80ml0qng1n0xh0mkps1nsmngnvcqjbb3247692lvpj";
   };
   
   buildInputs = [ ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Yori-cc website";
-    homepage = http://yori.cc;
+    homepage = https://yorickvanpelt.nl;
     maintainers = [ "Yorick" ];
   };
 }
diff --git a/pennyworth/configuration.nix b/pennyworth/configuration.nix
index d6b1192..052df29 100644
--- a/pennyworth/configuration.nix
+++ b/pennyworth/configuration.nix
@@ -64,6 +64,15 @@ in
     enable = true;
     challenges."${config.networking.hostName}" = acmeWebRoot;
     servers."yori.cc" = {
+      key_root = acmeKeyDir;
+      key_webroot = acmeWebRoot;
+      contents = ''
+        location / {
+          rewrite ^(.*) https://yorickvanpelt.nl$1 permanent;
+        }
+      '';
+    };
+    servers."yorickvanpelt.nl" = {
       key_root = acmeKeyDir;
       key_webroot = acmeWebRoot;
       contents = ''
@@ -81,9 +90,10 @@ in
     { email = secrets.email;
       extraDomains = {
         "${config.networking.hostName}" = null;
+        "yorickvanpelt.nl" = null;
       };
       webroot = acmeWebRoot;
-      postRun = ''systemctl reload nginx.service dovecot2.service opensmtpd.service
+      postRun = ''systemctl reload nginx.service dovecot2.service postfix.service
           systemctl restart prosody.service
       '';
     };