diff options
Diffstat (limited to 'hosts/cloud')
| -rw-r--r-- | hosts/cloud/bkk/configuration.nix | 21 | ||||
| -rw-r--r-- | hosts/cloud/sortug/configuration.nix | 4 | ||||
| -rw-r--r-- | hosts/cloud/sortug/mail.nix (renamed from hosts/cloud/sing/mail.nix) | 36 |
3 files changed, 36 insertions, 25 deletions
diff --git a/hosts/cloud/bkk/configuration.nix b/hosts/cloud/bkk/configuration.nix index 9769419..5a37599 100644 --- a/hosts/cloud/bkk/configuration.nix +++ b/hosts/cloud/bkk/configuration.nix @@ -26,12 +26,19 @@ # allowedTCPPorts = [ 993 465 40308 80 443 53 51820 5522 ]; # allowedUDPPorts = [ 993 465 40308 80 443 53 50000 50001 50002 50003 50004 50005 50006 50007 50008 50009 50010 51820 5522 ]; }; - services.ntfy-sh = { - enable = true; - settings = { - base-url = "https://n.urbit.men"; - listen-http = ":8090"; - }; - }; + # services.ntfy-sh = { + # enable = true; + # settings = { + # base-url = "https://n.urbit.men"; + # listen-http = ":8090"; + # }; + # }; system.stateVersion = "24.05"; # Did you read the comment? + environment.systemPackages = with pkgs; [ + tmux + git + lsd + ncdu + ]; + users.users.y.openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+qXhCHNrSZmy4HEXaFn6xAp1w2GzQBMOfVdbR3E81Q cloudboxes"]; } diff --git a/hosts/cloud/sortug/configuration.nix b/hosts/cloud/sortug/configuration.nix index d7d5394..fa4aad2 100644 --- a/hosts/cloud/sortug/configuration.nix +++ b/hosts/cloud/sortug/configuration.nix @@ -17,8 +17,7 @@ ./minio.nix # ./coturn.nix ./disk-config.nix - ../sing/mail.nix - # ./mail.nix + ./mail.nix ]; boot = { @@ -93,4 +92,5 @@ }; }; system.stateVersion = "24.05"; # Did you read the comment? + users.users.y.openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+qXhCHNrSZmy4HEXaFn6xAp1w2GzQBMOfVdbR3E81Q cloudboxes"]; } diff --git a/hosts/cloud/sing/mail.nix b/hosts/cloud/sortug/mail.nix index 1b88877..ef10866 100644 --- a/hosts/cloud/sing/mail.nix +++ b/hosts/cloud/sortug/mail.nix @@ -3,11 +3,12 @@ pkgs, ... }: { + # services.dovecot2.sieve.extensions = ["fileinto"]; mailserver = { enable = true; fqdn = "mail.sortug.com"; - domains = ["sortug.com"]; - + domains = ["sortug.com" "yago.onl"]; + # workaround # A list of all login accounts. To create the password hashes, use # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' loginAccounts = { @@ -37,7 +38,7 @@ hashedPasswordFile = "/home/y/mail.key"; }; "polwex@sortug.com" = { - hashedPasswordFile = "/home/y/mail2.key"; + hashedPasswordFile = "/home/y/mail.key"; }; "kinode@sortug.com" = { hashedPasswordFile = "/home/y/mail.key"; @@ -48,6 +49,9 @@ "support@sortug.com" = { hashedPasswordFile = "/home/y/mail.key"; }; + "sub@yago.onl" = { + hashedPasswordFile = "/home/y/mail.key"; + }; }; # Use Let's Encrypt certificates. Note that this needs to set up a stripped @@ -56,18 +60,18 @@ }; security.acme.acceptTerms = true; security.acme.defaults.email = "security@sortug.com"; - # services.roundcube = { - # enable = true; - # # this is the url of the vhost, not necessarily the same as the fqdn of - # # the mailserver - # hostName = "mail.sortug.com"; - # extraConfig = '' - # # starttls needed for authentication, so the fqdn required to match - # # the certificate - # $config['smtp_server'] = "tls://${config.mailserver.fqdn}"; - # $config['smtp_user'] = "%u"; - # $config['smtp_pass'] = "%p"; - # ''; - # }; + services.roundcube = { + enable = true; + # this is the url of the vhost, not necessarily the same as the fqdn of + # the mailserver + hostName = "mail.sortug.com"; + extraConfig = '' + # starttls needed for authentication, so the fqdn required to match + # the certificate + $config['smtp_server'] = "tls://${config.mailserver.fqdn}"; + $config['smtp_user'] = "%u"; + $config['smtp_pass'] = "%p"; + ''; + }; services.nginx.enable = true; } |