fix eval error*2
This commit is contained in:
parent
e73e76a932
commit
8b11f2e04c
1 changed files with 25 additions and 19 deletions
|
@ -46,10 +46,9 @@ in
|
||||||
sops.secrets."services/mastodon/vapid/private" = sopsConfig;
|
sops.secrets."services/mastodon/vapid/private" = sopsConfig;
|
||||||
sops.secrets."services/mastodon/vapid/public" = sopsConfig;
|
sops.secrets."services/mastodon/vapid/public" = sopsConfig;
|
||||||
|
|
||||||
services.nginx.virtualHosts."mastodon.chir.rs" = {
|
services.nginx.virtualHosts =
|
||||||
|
let mastodon = {
|
||||||
root = "${config.services.mastodon.package}/public/";
|
root = "${config.services.mastodon.package}/public/";
|
||||||
sslCertificate = "/var/lib/acme/chir.rs/cert.pem";
|
|
||||||
sslCertificateKey = "/var/lib/acme/chir.rs/key.pem";
|
|
||||||
locations."/system/".alias = "/var/lib/mastodon/public-system/";
|
locations."/system/".alias = "/var/lib/mastodon/public-system/";
|
||||||
|
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
|
@ -64,10 +63,17 @@ in
|
||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.nginx.virtualHosts."mastodon.int.chir.rs" = config.services.nginx.virtualHosts."mastodon.chir.rs" // {
|
in
|
||||||
|
{
|
||||||
|
"mastodon.chir.rs" = mastodon // {
|
||||||
|
sslCertificate = "/var/lib/acme/chir.rs/cert.pem";
|
||||||
|
sslCertificateKey = "/var/lib/acme/chir.rs/key.pem";
|
||||||
|
};
|
||||||
|
"mastodon.int.chir.rs" = mastodon // {
|
||||||
sslCertificate = "/var/lib/acme/int.chir.rs/cert.pem";
|
sslCertificate = "/var/lib/acme/int.chir.rs/cert.pem";
|
||||||
sslCertificateKey = "/var/lib/acme/int.chir.rs/key.pem";
|
sslCertificateKey = "/var/lib/acme/int.chir.rs/key.pem";
|
||||||
};
|
};
|
||||||
|
};
|
||||||
services.redis.servers.mastodon = {
|
services.redis.servers.mastodon = {
|
||||||
enable = true;
|
enable = true;
|
||||||
bind = "127.0.0.1";
|
bind = "127.0.0.1";
|
||||||
|
|
Loading…
Reference in a new issue