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/peertube/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'nixops/modules/websites/tools/peertube/default.nix')

diff --git a/nixops/modules/websites/tools/peertube/default.nix b/nixops/modules/websites/tools/peertube/default.nix
index bb601af..1ad79d7 100644
--- a/nixops/modules/websites/tools/peertube/default.nix
+++ b/nixops/modules/websites/tools/peertube/default.nix
@@ -30,8 +30,8 @@ in {
     systemd.services.peertube = {
       description = "Peertube";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "postgresql.service" "tools-peertube-key.service" ];
-      wants = [ "postgresql.service" "tools-peertube-key.service" ];
+      after = [ "network.target" "postgresql.service" ];
+      wants = [ "postgresql.service" ];
 
       environment.NODE_CONFIG_DIR = "${peertube.varDir}/config";
       environment.NODE_ENV = "production";
@@ -58,20 +58,20 @@ in {
       unitConfig.RequiresMountsFor = peertube.varDir;
     };
 
-    deployment.keys.tools-peertube = {
-      destDir = "/run/keys/webapps";
+    mySecrets.keys = [{
+      dest = "webapps/tools-peertube";
       user = "peertube";
       group = "peertube";
       permissions = "0640";
       text = peertube.config;
-    };
+    }];
 
     system.activationScripts.peertube = {
       deps = [ "users" ];
       text = ''
         install -m 0750 -o peertube -g peertube -d ${peertube.varDir}
         install -m 0750 -o peertube -g peertube -d ${peertube.varDir}/config
-        ln -sf /run/keys/webapps/tools-peertube ${peertube.varDir}/config/production.yaml
+        ln -sf /var/secrets/webapps/tools-peertube ${peertube.varDir}/config/production.yaml
         '';
     };
 
-- 
cgit v1.2.3