aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-03 18:09:14 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-03 18:09:14 +0200
commit508943b4171796a3b9670c1ee9fe6881734e9990 (patch)
treee4f05ed4d006e43e0069f9c5e44fea779739ff3a
parentf46a6c2601e2a99cfb07745a58f69d453a8ae481 (diff)
downloadNix-508943b4171796a3b9670c1ee9fe6881734e9990.tar.gz
Nix-508943b4171796a3b9670c1ee9fe6881734e9990.tar.zst
Nix-508943b4171796a3b9670c1ee9fe6881734e9990.zip
Remove mastodon build dependency on environment variables
-rw-r--r--nixops/modules/websites/tools/mastodon/mastodon.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixops/modules/websites/tools/mastodon/mastodon.nix b/nixops/modules/websites/tools/mastodon/mastodon.nix
index 516cc58..67d4d48 100644
--- a/nixops/modules/websites/tools/mastodon/mastodon.nix
+++ b/nixops/modules/websites/tools/mastodon/mastodon.nix
@@ -109,14 +109,14 @@ let
109 ''; 109 '';
110 }; 110 };
111 111
112 # FIXME: build machine will contain some passwords in the nix store
113 railsRoot = stdenv.mkDerivation { 112 railsRoot = stdenv.mkDerivation {
114 name = "mastodon_immae"; 113 name = "mastodon_immae";
115 inherit mastodon; 114 inherit mastodon;
116 builder = writeText "build_mastodon_immae" '' 115 builder = writeText "build_mastodon_immae" ''
117 source $stdenv/setup 116 source $stdenv/setup
118 set -a 117 set -a
119 ${keys.mastodon.text} 118 SECRET_KEY_BASE=Dummy
119 OTP_SECRET=Dummy
120 set +a 120 set +a
121 cp -a $mastodon $out 121 cp -a $mastodon $out
122 cd $out 122 cd $out