yorick
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

redirect to yorickvanpelt.nl

auto-flake-update
Yorick van Pelt 2016-09-22 19:36:20 +02:00
parent 330f52bf3e
commit 6852bbb9f3
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/yori-cc.nix
View File

@ -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" ];
};
}

12
pennyworth/configuration.nix
View File

@ -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
'';
};