diff options
Diffstat (limited to 'hosts/cloud')
| -rw-r--r-- | hosts/cloud/hetzner/mail.nix | 4 | ||||
| -rw-r--r-- | hosts/cloud/hetzner/nginx.nix | 24 | ||||
| -rw-r--r-- | hosts/cloud/packages.nix | 6 | ||||
| -rw-r--r-- | hosts/cloud/span/configuration.nix | 3 | ||||
| -rw-r--r-- | hosts/cloud/span/mail.nix | 1 |
5 files changed, 32 insertions, 6 deletions
diff --git a/hosts/cloud/hetzner/mail.nix b/hosts/cloud/hetzner/mail.nix index deab818..9ef4de8 100644 --- a/hosts/cloud/hetzner/mail.nix +++ b/hosts/cloud/hetzner/mail.nix @@ -35,7 +35,7 @@ protocol = "imap"; }; jmap = { - bind = "[::]:88888"; + bind = "[::]:8888"; url = "https://mail.urbit.cloud"; protocol = "jmap"; }; @@ -61,7 +61,7 @@ principals = [ { class = "individual"; - name = "User 1"; + name = "polwex"; secret = "%{file:/etc/stalwart/mail-pw1}%"; email = ["polwex@urbit.cloud"]; } diff --git a/hosts/cloud/hetzner/nginx.nix b/hosts/cloud/hetzner/nginx.nix index 1077e71..2e88843 100644 --- a/hosts/cloud/hetzner/nginx.nix +++ b/hosts/cloud/hetzner/nginx.nix @@ -25,12 +25,34 @@ proxy_cache off; ''; }; + # virtualHosts."bridge.urbit.cloud" = { + # enableACME = true; + # forceSSL = true; + # locations."/" = { + # proxyPass = "http://127.0.0.1:4444"; + # # proxyWebsockets = true; # needed if you need to use WebSocket + # extraConfig = '' + # proxy_set_header Host $host; + # proxy_set_header Forwarded $proxy_add_x_forwarded_for; + # ''; + # }; + # extraConfig = '' + # chunked_transfer_encoding off; + # proxy_http_version 1.1; + # proxy_buffering off; + # proxy_cache off; + # ''; + # }; virtualHosts."webmail.urbit.cloud" = { enableACME = true; forceSSL = true; + serverAliases = [ + "mail.urbit.cloud" + "mta-sts.urbit.cloud" + ]; locations."/" = { proxyPass = "http://127.0.0.1:8888"; - # proxyWebsockets = true; # needed if you need to use WebSocket + proxyWebsockets = true; # needed if you need to use WebSocket extraConfig = '' proxy_set_header Host $host; proxy_set_header Forwarded $proxy_add_x_forwarded_for; diff --git a/hosts/cloud/packages.nix b/hosts/cloud/packages.nix index 64f2c95..3a68a73 100644 --- a/hosts/cloud/packages.nix +++ b/hosts/cloud/packages.nix @@ -43,8 +43,9 @@ # networking curl - caddy # simple web server made with go - innernet + wget + # caddy # simple web server made with go + # innernet # s3 minio @@ -53,5 +54,6 @@ # databases # postgresql # sqlite + devenv ]; } diff --git a/hosts/cloud/span/configuration.nix b/hosts/cloud/span/configuration.nix index cdf39d7..d887d37 100644 --- a/hosts/cloud/span/configuration.nix +++ b/hosts/cloud/span/configuration.nix @@ -8,9 +8,10 @@ }: { imports = [ # Include the results of the hardware scan. + ../../base.nix ./hardware-configuration.nix ./users.nix - # ./mail.nix + ./mail.nix ../packages.nix ./nginx.nix ]; diff --git a/hosts/cloud/span/mail.nix b/hosts/cloud/span/mail.nix index 69be6a9..beee817 100644 --- a/hosts/cloud/span/mail.nix +++ b/hosts/cloud/span/mail.nix @@ -4,6 +4,7 @@ ... }: { mailserver = { + stateVersion = 3; enable = true; fqdn = "mail.spandrell.ch"; domains = ["spandrell.ch"]; |