Merge pull request 'Mailman fixes' (#32) from feat/mailman into main

Reviewed-on: pub-solar/infra-new#32
Reviewed-by: teutat3s <teutates@mailbox.org>
Reviewed-by: Akshay Mankar <axeman@noreply.git.pub.solar>
This commit is contained in:
Akshay Mankar 2023-10-29 12:38:24 +00:00
commit 0fa32ec92f
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
4 changed files with 17 additions and 2 deletions

View file

@ -46,6 +46,7 @@
HTTP_ADDR = "127.0.0.1"; HTTP_ADDR = "127.0.0.1";
HTTP_PORT = 3000; HTTP_PORT = 3000;
}; };
log.LEVEL = "Warn";
mailer = { mailer = {
ENABLED = true; ENABLED = true;
PROTOCOL = "smtps"; PROTOCOL = "smtps";

View file

@ -8,6 +8,19 @@
{ {
networking.firewall.allowedTCPPorts = [25]; networking.firewall.allowedTCPPorts = [25];
users.users.nginx.extraGroups = [ "mailman" ];
services.nginx.virtualHosts."list.pub.solar" = {
enableACME = true;
forceSSL = true;
};
# Tweak permissions so nginx can read and serve the static assets
# (otherwise /var/lib/mailman-web is mode 0600)
# https://nixos.wiki/wiki/Mailman
systemd.services.mailman-settings.script = ''
chmod o+x /var/lib/mailman-web-static
'';
services.postfix = { services.postfix = {
enable = true; enable = true;
relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"]; relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"];

View file

@ -32,6 +32,9 @@
owner = config.services.mastodon.user; owner = config.services.mastodon.user;
}; };
# Nginx user needs access to mastodon unix sockets
users.users.nginx.extraGroups = [ "mastodon" ];
services.mastodon = { services.mastodon = {
enable = true; enable = true;
# Different from WEB_DOMAIN in our case # Different from WEB_DOMAIN in our case

View file

@ -17,8 +17,6 @@ in {
}; };
recommendedProxySettings = true; recommendedProxySettings = true;
}; };
# Nginx user needs access to mastodon unix sockets
users.users.nginx.extraGroups = [ "mastodon" ];
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;