Use peertube flake in modules

3 files changed, 17 insertions, 5 deletions

diff --git a/modules/private/databases/openldap/immae.schema b/modules/private/databases/openldap/immae.schema
index f5ee5d5..d2ef972 100644
--- a/modules/private/databases/openldap/immae.schema
+++ b/modules/private/databases/openldap/immae.schema
@@ -161,7 +161,19 @@ objectclass ( ImmaeobjectClass:9 NAME 'immaeTaskClass'
         MUST ( immaeTaskId )
         )
 
-# Last:
-# attributetype (ImmaeattributeType:19 NAME 'immaeTaskId'
-# objectclass ( ImmaeobjectClass:9 NAME 'immaeTaskClass'
+# Peertube uid
+attributetype ( ImmaeattributeType:20 NAME 'immaePeertubeId'
+        DESC 'login for Peertube'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
 
+objectclass ( ImmaeobjectClass:10 NAME 'immaePeertubeClass'
+        DESC 'Expansion of the existing object classes for peertube'
+        SUP top AUXILIARY
+        MUST ( immaePeertubeId ) )
+
+
+# Last:
+# attributetype ( ImmaeattributeType:20 NAME 'immaePeertubeId'
+# objectclass ( ImmaeobjectClass:10 NAME 'immaePeertubeClass'
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/'
         '';
     }];