From 742697c95318d3625298437995e948ee00a00ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 25 Apr 2019 02:18:59 +0200
Subject: Move ssh ftp and mpd to new secrets

---
 nixops/modules/mpd/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'nixops/modules/mpd/default.nix')

diff --git a/nixops/modules/mpd/default.nix b/nixops/modules/mpd/default.nix
index 2cf37ad..0904732 100644
--- a/nixops/modules/mpd/default.nix
+++ b/nixops/modules/mpd/default.nix
@@ -4,20 +4,22 @@
     nixpkgs.overlays = [ (self: super: rec {
       mpd = (self.callPackage ./mpd.nix {}).mpd;
     }) ];
-    deployment.keys = {
-      mpd = {
+    mySecrets.keys = [
+      {
+        dest = "mpd";
         permissions = "0400";
         text = myconfig.env.mpd.password;
-      };
-      mpd-config = {
+      }
+      {
+        dest = "mpd-config";
         permissions = "0400";
         user = "mpd";
         group = "mpd";
         text = ''
           password "${myconfig.env.mpd.password}@read,add,control,admin"
         '';
-      };
-    };
+      }
+    ];
     networking.firewall.allowedTCPPorts = [ 6600 ];
     users.users.mpd.extraGroups = [ "wwwrun" "keys" ];
     system.activationScripts.mpd = ''
@@ -28,7 +30,7 @@
       network.listenAddress = "any";
       musicDirectory = myconfig.env.mpd.folder;
       extraConfig = ''
-        include "/run/keys/mpd-config"
+        include "/var/secrets/mpd-config"
         audio_output {
           type            "null"
           name            "No Output"
-- 
cgit v1.2.3