Try not authenticating with SMTP?
This commit is contained in:
parent
97d4dafd9b
commit
43989a6661
|
@ -26,7 +26,7 @@ in {
|
||||||
port = mkOption {
|
port = mkOption {
|
||||||
type = port;
|
type = port;
|
||||||
description = "Port at which to serve Mastodon web requests.";
|
description = "Port at which to serve Mastodon web requests.";
|
||||||
default = 3000;
|
default = 55001;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment-files = mkOption {
|
environment-files = mkOption {
|
||||||
|
@ -51,10 +51,11 @@ in {
|
||||||
user = mkOption {
|
user = mkOption {
|
||||||
type = str;
|
type = str;
|
||||||
description = "User as which to authenticate to the SMTP server.";
|
description = "User as which to authenticate to the SMTP server.";
|
||||||
|
default = "mastodon";
|
||||||
};
|
};
|
||||||
|
|
||||||
password-file = mkOption {
|
password-file = mkOption {
|
||||||
type = str;
|
type = nullOr str;
|
||||||
description = "Path to file containing SMTP password";
|
description = "Path to file containing SMTP password";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -90,12 +91,13 @@ in {
|
||||||
postgresql.enable = true;
|
postgresql.enable = true;
|
||||||
mastodon = {
|
mastodon = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
webPort = cfg.port;
|
||||||
localDomain = cfg.domain;
|
localDomain = cfg.domain;
|
||||||
extraEnvFiles = cfg.environment-files;
|
extraEnvFiles = cfg.environment-files;
|
||||||
smtp = {
|
smtp = {
|
||||||
inherit (cfg.smtp) host port user;
|
inherit (cfg.smtp) host port user;
|
||||||
fromAddress = cfg.smtp.from-address;
|
fromAddress = cfg.smtp.from-address;
|
||||||
authenticate = true;
|
authenticate = !isNull cfg.smtp.password-file;
|
||||||
passwordFile = cfg.smtp.password-file;
|
passwordFile = cfg.smtp.password-file;
|
||||||
};
|
};
|
||||||
redis.createLocally = true;
|
redis.createLocally = true;
|
||||||
|
|
Loading…
Reference in New Issue