From 32c84ff89c2b8931f58cea63961a178a9b1d0efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 25 Apr 2019 09:05:46 +0200
Subject: Move etherpad mastodon mediagoblin task and peertube to new secrets

---
 nixops/modules/websites/tools/mediagoblin/default.nix     | 6 +++---
 nixops/modules/websites/tools/mediagoblin/mediagoblin.nix | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'nixops/modules/websites/tools/mediagoblin')

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 {
   };
 
   config = lib.mkIf cfg.enable {
-    deployment.keys = mediagoblin.keys;
+    mySecrets.keys = mediagoblin.keys;
     ids.uids.mediagoblin = myconfig.env.tools.mediagoblin.user.uid;
     ids.gids.mediagoblin = myconfig.env.tools.mediagoblin.user.gid;
 
@@ -31,8 +31,8 @@ in {
     systemd.services.mediagoblin-web = {
       description = "Mediagoblin service";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "tools-mediagoblin-key.service" ];
-      wants = [ "postgresql.service" "redis.service" "tools-mediagoblin-key.service" ];
+      after = [ "network.target" ];
+      wants = [ "postgresql.service" "redis.service" ];
 
       environment.SCRIPT_NAME = "/mediagoblin/";
 
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
       url_scheme = https
       '';
 
-    keys.tools-mediagoblin = {
-      destDir = "/run/keys/webapps";
+    keys = [{
+      dest = "webapps/tools-mediagoblin";
       user = "mediagoblin";
       group = "mediagoblin";
       permissions = "0400";
@@ -250,7 +250,7 @@ in
           [[mediagoblin.media_types.image]]
           [[mediagoblin.media_types.video]]
         '';
-    };
+    }];
     pythonRoot =
       with pkgs.gst_all_1;
       stdenv.mkDerivation {
@@ -287,7 +287,7 @@ in
             --prefix GI_TYPELIB_PATH : ${typelib_paths}
           find . -type f -exec sed -i "s|$mediagoblin|$out|g" {} \;
           ln -s ${paste_local} ./paste_local.ini
-          ln -s /run/keys/webapps/tools-mediagoblin ./mediagoblin_local.ini
+          ln -s /var/secrets/webapps/tools-mediagoblin ./mediagoblin_local.ini
           ln -sf ${varDir} ./user_dev
           '';
       };
-- 
cgit v1.2.3