diff options
| -rw-r--r-- | modules/mailserver.nix | 7 | ||||
| -rw-r--r-- | modules/pdf.nix | 9 | ||||
| -rw-r--r-- | modules/user.nix | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/modules/mailserver.nix b/modules/mailserver.nix index 80c8af5..149d322 100644 --- a/modules/mailserver.nix +++ b/modules/mailserver.nix @@ -1,8 +1,8 @@ { config, pkgs, ... }: { imports = [ (builtins.fetchTarball { - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-24.11/nixos-mailserver-nixos-24.11.tar.gz"; - sha256 = "05k4nj2cqz1c5zgqa0c6b8sp3807ps385qca74fgs6cdc415y3qw"; + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-25.05/nixos-mailserver-nixos-25.05.tar.gz"; + sha256 = "0jpp086m839dz6xh6kw5r8iq0cm4nd691zixzy6z11c4z2vf8v85"; }) ]; @@ -11,12 +11,13 @@ fqdn = "mail.krinitsin.com"; domains = [ "krinitsin.com" ]; certificateScheme = "acme-nginx"; + lmtpSaveToDetailMailbox = "no"; # To create the password hashes, use nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' loginAccounts = { "mail@krinitsin.com" = { hashedPasswordFile = "/secret/mail@krinitsin.com"; - aliases = [ "postmaster@krinitsin.com" "christian@krinitsin.com" ]; + aliases = [ "postmaster@krinitsin.com" "christian@krinitsin.com" "@krinitsin.com" ]; }; "wladislaw@krinitsin.com" = { hashedPasswordFile = "/secret/wladislaw@krinitsin.com"; diff --git a/modules/pdf.nix b/modules/pdf.nix index 06a9539..4f38053 100644 --- a/modules/pdf.nix +++ b/modules/pdf.nix @@ -11,7 +11,14 @@ services.nginx.virtualHosts."pdf.krinitsin.com" = { forceSSL = true; useACMEHost = "krinitsin.com"; - locations."/".proxyPass = "http://localhost:5031"; + locations."/" = { + proxyPass = "http://localhost:5031"; + recommendedProxySettings = true; + extraConfig = '' + sub_filter '</body>' '<script> document.querySelectorAll(".go-pro-badge").forEach(badge => badge.remove()); </script></body>'; + sub_filter_once on; + ''; + }; }; security.acme.certs."krinitsin.com".extraDomainNames = [ "pdf.krinitsin.com" ]; diff --git a/modules/user.nix b/modules/user.nix index 36edd1f..b88038d 100644 --- a/modules/user.nix +++ b/modules/user.nix @@ -5,8 +5,8 @@ isNormalUser = true; extraGroups = [ "wheel" ]; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBi+VYFQOfb7J2eJd8CiXKcaLD+QfztXiS2pU07oHZNr chris@archiso" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDwlqdl/70dJ1ABKwLEdLB6/RDpfE4RVaB+xL3YJ1v3+ chris@kingpin" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL7ghrJVl24UkfnyNOz21jbmrnPImp3+UR4/p2xymbnl chris@deskpin" ]; }; security.sudo.wheelNeedsPassword = false; |