From 3d11eafc9c516321901908338befe4c04b58f3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 23 Jan 2021 23:26:11 +0100
Subject: Use peertube flake in modules

---
 modules/private/websites/syden/peertube.nix         | 2 +-
 modules/private/websites/tools/peertube/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/private/websites')

diff --git a/modules/private/websites/syden/peertube.nix b/modules/private/websites/syden/peertube.nix
index 5732928..aa465d7 100644
--- a/modules/private/websites/syden/peertube.nix
+++ b/modules/private/websites/syden/peertube.nix
@@ -3,7 +3,7 @@ let
   scfg = config.myServices.websites.syden.peertube;
   name = "peertube";
   dataDir = "/var/lib/syden_peertube";
-  package = (pkgs.mylibs.flakeCompat ../../../../flakes/private/peertube).default;
+  package = (pkgs.mylibs.flakeCompat ../../../../flakes/private/peertube).packages.x86_64-linux.peertube_syden;
   env = config.myEnv.tools.syden_peertube;
 in
 {
diff --git a/modules/private/websites/tools/peertube/default.nix b/modules/private/websites/tools/peertube/default.nix
index 3345453..9c5ef5a 100644
--- a/modules/private/websites/tools/peertube/default.nix
+++ b/modules/private/websites/tools/peertube/default.nix
@@ -15,7 +15,6 @@ in {
     services.peertube = {
       enable = true;
       configFile = "/var/secrets/webapps/tools-peertube";
-      package = pkgs.webapps.peertube.override { ldap = true; sendmail = true; light = "fr-FR"; };
     };
     users.users.peertube.extraGroups = [ "keys" ];
 
@@ -73,6 +72,7 @@ in {
           captions: '${pcfg.dataDir}/storage/captions/'
           cache: '${pcfg.dataDir}/storage/cache/'
           plugins: '${pcfg.dataDir}/storage/plugins/'
+          client_overrides: '${pcfg.dataDir}/storage/client-overrides/'
         '';
     }];
 
-- 
cgit v1.2.3