diff options
Diffstat (limited to 'nixops/modules/websites/tools/mastodon/mastodon.nix')
-rw-r--r-- | nixops/modules/websites/tools/mastodon/mastodon.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixops/modules/websites/tools/mastodon/mastodon.nix b/nixops/modules/websites/tools/mastodon/mastodon.nix index 944b2db..3ee3552 100644 --- a/nixops/modules/websites/tools/mastodon/mastodon.nix +++ b/nixops/modules/websites/tools/mastodon/mastodon.nix | |||
@@ -58,8 +58,8 @@ let | |||
58 | ''; | 58 | ''; |
59 | buildInputs = [ yarnModules ]; | 59 | buildInputs = [ yarnModules ]; |
60 | }); | 60 | }); |
61 | keys.tools-mastodon = { | 61 | keys.mastodon = { |
62 | destDir = "/run/keys/webapps"; | 62 | dest = "webapps/tools-mastodon"; |
63 | user = "mastodon"; | 63 | user = "mastodon"; |
64 | group = "mastodon"; | 64 | group = "mastodon"; |
65 | permissions = "0400"; | 65 | permissions = "0400"; |
@@ -113,7 +113,7 @@ let | |||
113 | builder = writeText "build_mastodon_immae" '' | 113 | builder = writeText "build_mastodon_immae" '' |
114 | source $stdenv/setup | 114 | source $stdenv/setup |
115 | set -a | 115 | set -a |
116 | ${keys.tools-mastodon.text} | 116 | ${keys.mastodon.text} |
117 | set +a | 117 | set +a |
118 | cp -a $mastodon $out | 118 | cp -a $mastodon $out |
119 | cd $out | 119 | cd $out |
@@ -128,7 +128,8 @@ let | |||
128 | }; | 128 | }; |
129 | in | 129 | in |
130 | { | 130 | { |
131 | inherit railsRoot keys varDir socketsDir gems; | 131 | inherit railsRoot varDir socketsDir gems; |
132 | keys = builtins.attrValues keys; | ||
132 | nodeSocket = "${socketsDir}/live_immae_node.sock"; | 133 | nodeSocket = "${socketsDir}/live_immae_node.sock"; |
133 | railsSocket = "${socketsDir}/live_immae_puma.sock"; | 134 | railsSocket = "${socketsDir}/live_immae_puma.sock"; |
134 | } | 135 | } |