X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fmastodon%2Fdefault.nix;h=048d845c8906b200ae33c1e7d44b6c161bd2509f;hp=ebea48f4a72d59817fe728b34723b6bb2fff4ba1;hb=50933a04f9db56a6368f40bdfe33e988d1a269df;hpb=51900e3488284b0711083819a5ecb1b0f280a913 diff --git a/nixops/modules/websites/tools/mastodon/default.nix b/nixops/modules/websites/tools/mastodon/default.nix index ebea48f..048d845 100644 --- a/nixops/modules/websites/tools/mastodon/default.nix +++ b/nixops/modules/websites/tools/mastodon/default.nix @@ -13,6 +13,7 @@ in { }; config = lib.mkIf cfg.enable { + deployment.keys = mastodon.keys; ids.uids.mastodon = myconfig.env.tools.mastodon.user.uid; ids.gids.mastodon = myconfig.env.tools.mastodon.user.gid; @@ -54,7 +55,7 @@ in { serviceConfig = { User = "mastodon"; - EnvironmentFile = mastodon.config; + EnvironmentFile = "/run/keys/webapps/tools-mastodon"; PrivateTmp = true; Restart = "always"; TimeoutSec = 15; @@ -87,7 +88,7 @@ in { serviceConfig = { User = "mastodon"; - EnvironmentFile = mastodon.config; + EnvironmentFile = "/run/keys/webapps/tools-mastodon"; PrivateTmp = true; Restart = "always"; TimeoutSec = 60; @@ -116,7 +117,7 @@ in { serviceConfig = { User = "mastodon"; - EnvironmentFile = mastodon.config; + EnvironmentFile = "/run/keys/webapps/tools-mastodon"; PrivateTmp = true; Restart = "always"; TimeoutSec = 15;