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/task/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nixops/modules/task')

diff --git a/nixops/modules/task/default.nix b/nixops/modules/task/default.nix
index 2001eaa..9671725 100644
--- a/nixops/modules/task/default.nix
+++ b/nixops/modules/task/default.nix
@@ -87,8 +87,8 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    deployment.keys.tools-taskwarrior-web = {
-      destDir = "/run/keys/webapps";
+    mySecrets.keys = [{
+      dest = "webapps/tools-taskwarrior-web";
       user = "wwwrun";
       group = "wwwrun";
       permissions = "0400";
@@ -101,7 +101,7 @@ in {
           SetEnv TASKD_LDAP_BASE     "${env.ldap.base}"
           SetEnv TASKD_LDAP_FILTER   "${env.ldap.search}"
         '';
-    };
+    }];
     security.acme.certs."eldiron".extraDomains.${fqdn} = null;
     services.myWebsites.tools.modules = [ "proxy_fcgi" "sed" ];
     services.myWebsites.tools.vhostConfs.task = {
@@ -116,7 +116,7 @@ in {
           <FilesMatch "\.php$">
             SetHandler "proxy:unix:/var/run/phpfpm/task.sock|fcgi://localhost"
           </FilesMatch>
-          Include /run/keys/webapps/tools-taskwarrior-web
+          Include /var/secrets/webapps/tools-taskwarrior-web
         </Directory>
         ''
         ''
-- 
cgit v1.2.3