summaryrefslogtreecommitdiff
path: root/host/software/server
diff options
context:
space:
mode:
Diffstat (limited to 'host/software/server')
-rw-r--r--host/software/server/mail.nix10
-rw-r--r--host/software/server/website.nix6
2 files changed, 6 insertions, 10 deletions
diff --git a/host/software/server/mail.nix b/host/software/server/mail.nix
index 37c007b..c58c879 100644
--- a/host/software/server/mail.nix
+++ b/host/software/server/mail.nix
@@ -1,14 +1,6 @@
{ config, pkgs, ... }:
{
- imports = let
- release = "nixos-21.05";
- in [
- (builtins.fetchTarball {
- url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz";
- })
- ];
-
mailserver = {
enable = true;
fqdn = "mx.kummerlaender.eu";
@@ -17,7 +9,7 @@
loginAccounts = import ./mailusers.nix;
# Enable LetsEncrypt
- certificateScheme = 3;
+ certificateScheme = "acme-nginx";
enableImap = true;
enableImapSsl = true;
diff --git a/host/software/server/website.nix b/host/software/server/website.nix
index 8248a0b..b14018b 100644
--- a/host/software/server/website.nix
+++ b/host/software/server/website.nix
@@ -13,7 +13,6 @@
# `public` generates websites using their custom derivations via `nix-build`
services.nginx.virtualHosts = let
-
default = locations: {
inherit locations;
addSSL = true;
@@ -36,11 +35,13 @@
return ${target};
'';
};
+
in {
"kummerlaender.eu" = website "overview";
"blog.kummerlaender.eu" = website "blog";
"blip.kummerlaender.eu" = website "blip";
"tree.kummerlaender.eu" = website "tree";
+
"static.kummerlaender.eu" = website "static" // {
extraConfig = ''
add_header Access-Control-Allow-Origin *;
@@ -60,5 +61,8 @@
}
'';
};
+
+ "vtd.productions" = website "vtd";
+
};
}