diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-25 09:05:46 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-04-25 09:05:46 +0200 |
commit | 32c84ff89c2b8931f58cea63961a178a9b1d0efe (patch) | |
tree | 7a90c28e1db3d8c704b2371737f2f2fae471db67 /nixops/modules/websites/tools/mediagoblin | |
parent | 742697c95318d3625298437995e948ee00a00ba5 (diff) | |
download | Nix-32c84ff89c2b8931f58cea63961a178a9b1d0efe.tar.gz Nix-32c84ff89c2b8931f58cea63961a178a9b1d0efe.tar.zst Nix-32c84ff89c2b8931f58cea63961a178a9b1d0efe.zip |
Move etherpad mastodon mediagoblin task and peertube to new secrets
Diffstat (limited to 'nixops/modules/websites/tools/mediagoblin')
-rw-r--r-- | nixops/modules/websites/tools/mediagoblin/default.nix | 6 | ||||
-rw-r--r-- | nixops/modules/websites/tools/mediagoblin/mediagoblin.nix | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nixops/modules/websites/tools/mediagoblin/default.nix b/nixops/modules/websites/tools/mediagoblin/default.nix index 9b058be..36329d9 100644 --- a/nixops/modules/websites/tools/mediagoblin/default.nix +++ b/nixops/modules/websites/tools/mediagoblin/default.nix | |||
@@ -12,7 +12,7 @@ in { | |||
12 | }; | 12 | }; |
13 | 13 | ||
14 | config = lib.mkIf cfg.enable { | 14 | config = lib.mkIf cfg.enable { |
15 | deployment.keys = mediagoblin.keys; | 15 | mySecrets.keys = mediagoblin.keys; |
16 | ids.uids.mediagoblin = myconfig.env.tools.mediagoblin.user.uid; | 16 | ids.uids.mediagoblin = myconfig.env.tools.mediagoblin.user.uid; |
17 | ids.gids.mediagoblin = myconfig.env.tools.mediagoblin.user.gid; | 17 | ids.gids.mediagoblin = myconfig.env.tools.mediagoblin.user.gid; |
18 | 18 | ||
@@ -31,8 +31,8 @@ in { | |||
31 | systemd.services.mediagoblin-web = { | 31 | systemd.services.mediagoblin-web = { |
32 | description = "Mediagoblin service"; | 32 | description = "Mediagoblin service"; |
33 | wantedBy = [ "multi-user.target" ]; | 33 | wantedBy = [ "multi-user.target" ]; |
34 | after = [ "network.target" "tools-mediagoblin-key.service" ]; | 34 | after = [ "network.target" ]; |
35 | wants = [ "postgresql.service" "redis.service" "tools-mediagoblin-key.service" ]; | 35 | wants = [ "postgresql.service" "redis.service" ]; |
36 | 36 | ||
37 | environment.SCRIPT_NAME = "/mediagoblin/"; | 37 | environment.SCRIPT_NAME = "/mediagoblin/"; |
38 | 38 | ||
diff --git a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix index 23ee24d..bc423db 100644 --- a/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix +++ b/nixops/modules/websites/tools/mediagoblin/mediagoblin.nix | |||
@@ -190,8 +190,8 @@ in | |||
190 | url_scheme = https | 190 | url_scheme = https |
191 | ''; | 191 | ''; |
192 | 192 | ||
193 | keys.tools-mediagoblin = { | 193 | keys = [{ |
194 | destDir = "/run/keys/webapps"; | 194 | dest = "webapps/tools-mediagoblin"; |
195 | user = "mediagoblin"; | 195 | user = "mediagoblin"; |
196 | group = "mediagoblin"; | 196 | group = "mediagoblin"; |
197 | permissions = "0400"; | 197 | permissions = "0400"; |
@@ -250,7 +250,7 @@ in | |||
250 | [[mediagoblin.media_types.image]] | 250 | [[mediagoblin.media_types.image]] |
251 | [[mediagoblin.media_types.video]] | 251 | [[mediagoblin.media_types.video]] |
252 | ''; | 252 | ''; |
253 | }; | 253 | }]; |
254 | pythonRoot = | 254 | pythonRoot = |
255 | with pkgs.gst_all_1; | 255 | with pkgs.gst_all_1; |
256 | stdenv.mkDerivation { | 256 | stdenv.mkDerivation { |
@@ -287,7 +287,7 @@ in | |||
287 | --prefix GI_TYPELIB_PATH : ${typelib_paths} | 287 | --prefix GI_TYPELIB_PATH : ${typelib_paths} |
288 | find . -type f -exec sed -i "s|$mediagoblin|$out|g" {} \; | 288 | find . -type f -exec sed -i "s|$mediagoblin|$out|g" {} \; |
289 | ln -s ${paste_local} ./paste_local.ini | 289 | ln -s ${paste_local} ./paste_local.ini |
290 | ln -s /run/keys/webapps/tools-mediagoblin ./mediagoblin_local.ini | 290 | ln -s /var/secrets/webapps/tools-mediagoblin ./mediagoblin_local.ini |
291 | ln -sf ${varDir} ./user_dev | 291 | ln -sf ${varDir} ./user_dev |
292 | ''; | 292 | ''; |
293 | }; | 293 | }; |