diff options
Diffstat (limited to '')
| -rw-r--r-- | hosts/by-name/server2/configuration.nix | 8 | ||||
| -rw-r--r-- | hosts/by-name/server3/configuration.nix | 34 |
2 files changed, 24 insertions, 18 deletions
diff --git a/hosts/by-name/server2/configuration.nix b/hosts/by-name/server2/configuration.nix index 5b85e69..8cdd45d 100644 --- a/hosts/by-name/server2/configuration.nix +++ b/hosts/by-name/server2/configuration.nix @@ -1,4 +1,8 @@ -{lib, ...}: { +{ + lib, + pkgs, + ... +}: { imports = [ ./networking.nix # network configuration that just works ./hardware.nix @@ -59,9 +63,11 @@ }; nextcloud = { enable = true; + package = pkgs.nextcloud33; hostname = "nextcloud.vhack.eu"; adminpassFile = ./secrets/nextcloud/adminpassFile.age; }; + nginx = { enable = true; redirects = { diff --git a/hosts/by-name/server3/configuration.nix b/hosts/by-name/server3/configuration.nix index a7cdc1d..5960932 100644 --- a/hosts/by-name/server3/configuration.nix +++ b/hosts/by-name/server3/configuration.nix @@ -73,23 +73,23 @@ ]; }; stalwart-mail = { - enable = true; - fqdn = "mail.vhack.eu"; - admin = "admin@vhack.eu"; - security = { - dkimKeys = let - loadKey = name: { - dkimPublicKey = builtins.readFile (./secrets/dkim + "/${name}-public"); - dkimPrivateKeyPath = ./secrets/dkim + "/${name}-private.age"; - keyAlgorithm = "ed25519-sha256"; - }; - in { - "mail.vhack.eu" = loadKey "mail.vhack.eu"; - }; - verificationMode = "strict"; - }; - openFirewall = true; - principals = null; + # enable = false; + # fqdn = "mail.vhack.eu"; + # admin = "admin@vhack.eu"; + # security = { + # dkimKeys = let + # loadKey = name: { + # dkimPublicKey = builtins.readFile (./secrets/dkim + "/${name}-public"); + # dkimPrivateKeyPath = ./secrets/dkim + "/${name}-private.age"; + # keyAlgorithm = "ed25519-sha256"; + # }; + # in { + # "mail.vhack.eu" = loadKey "mail.vhack.eu"; + # }; + # verificationMode = "strict"; + # }; + # openFirewall = true; + # principals = null; }; postgresql.enable = true; rust-motd.enable = true; |