hacc/haccfiles
8
0
Fork 1
Code Issues 1 Pull requests Projects Releases Wiki Activity

services/mail: migrate to parsons

Browse source
This commit is contained in:
hexchen 2021-08-07 21:26:56 +00:00
parent f5579bc98e
commit cdeb52f808
4 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hosts/hainich/configuration.nix
View file

@ -5,9 +5,6 @@
../../common ../../common
./encboot.nix ./encboot.nix
./hardware.nix ./hardware.nix
./services/mail.nix
./services/hedgedoc_hacc.nix
./services/hedgedoc_i4f.nix
../../common ../../common
# ./wireguard.nix # ./wireguard.nix
./services/nginx.nix ./services/nginx.nix
@ -16,9 +13,6 @@
./services/gitlab-runner.nix ./services/gitlab-runner.nix
./services/lantifa.nix ./services/lantifa.nix
./services/syncthing.nix ./services/syncthing.nix
./services/monitoring.nix
./services/workadventure.nix
./services/mattermost.nix
]; ];
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.version = 2; boot.loader.grub.version = 2;

1
hosts/parsons/configuration.nix
View file

@ -14,6 +14,7 @@
../../services/murmur.nix ../../services/murmur.nix
../../services/hedgedoc-hacc.nix ../../services/hedgedoc-hacc.nix
../../services/hedgedoc-i4f.nix ../../services/hedgedoc-i4f.nix
../../services/mail.nix
]; ];
hexchen.encboot = { hexchen.encboot = {

15
nix/sources.json
View file

@ -59,19 +59,20 @@
"branch": "main", "branch": "main",
"ref": "main", "ref": "main",
"repo": "https://gitlab.com/hexchen/nixfiles", "repo": "https://gitlab.com/hexchen/nixfiles",
"rev": "1ae89906c8fb5cf45384eb2821bd89c807c1564f", "rev": "ef358992030e9a6fa975a24bf4d9aa133bc72424",
"sha256": "03yicni5jfr5qjillj3dp899n3lq7dhqrg66dr0w1vy12d0lp43s", "sha256": "01hcdrpfc8g1bbc96h7gi04zmyxi9vd7392ncadwfkx5xfd2fp17",
"type": "tarball", "type": "tarball",
"url": "https://gitlab.com/hexchen/nixfiles/-/archive/1ae89906c8fb5cf45384eb2821bd89c807c1564f.tar.gz", "url": "https://gitlab.com/hexchen/nixfiles/-/archive/ef358992030e9a6fa975a24bf4d9aa133bc72424.tar.gz",
"url_template": "<repo>/-/archive/<rev>.tar.gz" "url_template": "<repo>/-/archive/<rev>.tar.gz"
}, },
"nixos-mailserver": { "nixos-mailserver": {
"ref": "nixos-20.09", "branch": "nixos-21.05",
"ref": "nixos-21.05",
"repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver", "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
"rev": "fb1cc04c0a517d4200237b02c3472bcaf9104afb", "rev": "5675b122a947b40e551438df6a623efad19fd2e7",
"sha256": "0vsvgxxg5cgmzwj98171j7h5l028f1yq784alb3lxgbk8znfk51y", "sha256": "1fwhb7a5v9c98nzhf3dyqf3a5ianqh7k50zizj8v5nmj3blxw4pi",
"type": "tarball", "type": "tarball",
"url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/fb1cc04c0a517d4200237b02c3472bcaf9104afb/nixos-mailserver-fb1cc04c0a517d4200237b02c3472bcaf9104afb.tar.gz", "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/5675b122a947b40e551438df6a623efad19fd2e7.tar.gz",
"url_template": "<repo>/-/archive/<rev>.tar.gz" "url_template": "<repo>/-/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixpkgs": {

10
hosts/hainich/services/mail.nix → services/mail.nix
View file

@ -1,14 +1,12 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, sources, ... }:
let {
sources = import ../../../nix/sources.nix;
in {
imports = [ imports = [
sources.nixos-mailserver.outPath sources.nixos-mailserver.outPath
]; ];
mailserver = { mailserver = {
mailDirectory = "/data/mail"; mailDirectory = "/persist/mail";
enable = true; enable = true;
fqdn = "mail.hacc.space"; fqdn = "mail.hacc.space";
domains = [ "hacc.space" "muc.hacc.space" "hacc.earth" "4future.dev" "4futu.re" "infra4future.de" "discuss.infra4future.de" ]; domains = [ "hacc.space" "muc.hacc.space" "hacc.earth" "4future.dev" "4futu.re" "infra4future.de" "discuss.infra4future.de" ];
@ -145,6 +143,8 @@ in {
enable = true; enable = true;
script = "${pkgs.alps}/bin/alps -theme alps imaps://mail.hacc.space:993 smtps://mail.hacc.space:465"; script = "${pkgs.alps}/bin/alps -theme alps imaps://mail.hacc.space:993 smtps://mail.hacc.space:465";
serviceConfig.WorkingDirectory = "${pkgs.alps}/share/alps"; serviceConfig.WorkingDirectory = "${pkgs.alps}/share/alps";
serviceConfig.Restart = "always";
requiredBy = [ "multi-user.target" ];
}; };
services.nginx.virtualHosts."mail.hacc.space" = { services.nginx.virtualHosts."mail.hacc.space" = {