Cleanup etherpad-lite module

[perso/Immae/Config/Nix.git] / 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 1f88a1563a40abceff8f942ced3ae3f48cd35577..1ad79d7acd2c19a42300a1e39da0d28fa95f8be3 100644 (file)
--- a/nixops/modules/websites/tools/peertube/default.nix
+++ b/nixops/modules/websites/tools/peertube/default.nix
@@ -22,6 +22,7 @@ in {
       description = "Peertube user";
       home = peertube.varDir;
       useDefaultShell = true;
+      extraGroups = [ "keys" ];
     };
 
     users.groups.peertube.gid = config.ids.gids.peertube;
@@ -29,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";
@@ -57,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 = "0400";
+      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
-        install -m 0640 -o peertube -g peertube -T /run/keys/webapps/tools-peertube ${peertube.varDir}/config/production.yaml
+        ln -sf /var/secrets/webapps/tools-peertube ${peertube.varDir}/config/production.yaml
         '';
     };