From 4c8d4af865386b0e51a91512288c5228d1fa5bd9 Mon Sep 17 00:00:00 2001 From: hexchen Date: Wed, 9 Dec 2020 12:01:39 +0000 Subject: [PATCH] hainich: fix alps webmail --- configuration/hosts/hainich/services/mail.nix | 10 ++++++++-- pkgs/alps/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configuration/hosts/hainich/services/mail.nix b/configuration/hosts/hainich/services/mail.nix index bdf2572..3e69b5b 100644 --- a/configuration/hosts/hainich/services/mail.nix +++ b/configuration/hosts/hainich/services/mail.nix @@ -179,7 +179,13 @@ contact@hacc.space info@hacc.space''; systemd.services.alps = { enable = true; - script = "${pkgs.alps}/bin/alps -theme sourcehut imaps://mail.hacc.space:993 smtps://mail.hacc.space:465"; - unitConfig.WorkingDirectory = "${pkgs.alps}/share/alps"; + script = "${pkgs.alps}/bin/alps -theme alps imaps://mail.hacc.space:993 smtps://mail.hacc.space:465"; + serviceConfig.WorkingDirectory = "${pkgs.alps}/share/alps"; + }; + + services.nginx.virtualHosts."mail.hacc.space" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://[::1]:1323"; }; } diff --git a/pkgs/alps/default.nix b/pkgs/alps/default.nix index d96362b..715f884 100644 --- a/pkgs/alps/default.nix +++ b/pkgs/alps/default.nix @@ -6,10 +6,10 @@ buildGoModule rec { src = fetchGit { url = "https://git.sr.ht/~migadu/alps"; - rev = "5cef0aaff2b8b6ee3e00b566123517e241d8cfb8"; + rev = "51498a2dc37987f55b022efb961b68a282be17ed"; }; - vendorSha256 = "0hdfh6zdrjq97yj60dfsncl02cp8rpx4d4cqhk3zj0bhmpmrzddi"; + vendorSha256 = "0wc8fb03zlc1gl4nxlsh149gvpvrs3lc0smzrnam9smigg9gw4in"; subPackages = [ "cmd/alps" ];