X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fsyden%2Fpeertube.nix;h=64d4a5d8c3e371735e69d88301cebb2da10cc7d7;hb=5315b439af1f72c3282549508ae58d86d66e38ec;hp=2ad72175130e9e0322f75ce002d6e0e1c30b77ed;hpb=8a05c7fb2e7aad81ce4eb31b5173f4dabf353e31;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/syden/peertube.nix b/modules/private/websites/syden/peertube.nix
index 2ad7217..64d4a5d 100644
--- a/modules/private/websites/syden/peertube.nix
+++ b/modules/private/websites/syden/peertube.nix
@@ -3,16 +3,13 @@ let
   scfg = config.myServices.websites.syden.peertube;
   name = "peertube";
   dataDir = "/var/lib/syden_peertube";
-  package = pkgs.webapps.peertube.override { sendmail = true; syden = true; light = "fr-FR"; };
+  package = (pkgs.mylibs.flakeCompat ../../../../flakes/private/peertube).packages.x86_64-linux.peertube_syden;
   env = config.myEnv.tools.syden_peertube;
 in
 {
   options.myServices.websites.syden.peertube.enable = lib.mkEnableOption "enable Syden's website";
 
   config = lib.mkIf scfg.enable {
-    services.duplyBackup.profiles.syden_peertube = {
-      rootDir = dataDir;
-    };
     users.users.peertube = {
       uid = config.ids.uids.peertube;
       group = "peertube";
@@ -22,8 +19,7 @@ in
     };
     users.groups.peertube.gid = config.ids.gids.peertube;
 
-    secrets.keys = [{
-      dest = "webapps/syden-peertube";
+    secrets.keys."websites/syden/peertube" = {
       user = "peertube";
       group = "peertube";
       permissions = "0640";
@@ -33,7 +29,7 @@ in
           port: ${toString env.listenPort}
         webserver:
           https: true
-          hostname: 'syden.immae.eu'
+          hostname: 'record-links.immae.eu'
           port: 443
         database:
           hostname: '${env.postgresql.socket}'
@@ -64,12 +60,13 @@ in
           captions: '${dataDir}/storage/captions/'
           cache: '${dataDir}/storage/cache/'
           plugins: '${dataDir}/storage/plugins/'
+          client_overrides: '${dataDir}/storage/client-overrides/'
         '';
-    }];
+    };
 
     services.filesWatcher.syden_peertube = {
       restart = true;
-      paths = [ "/var/secrets/webapps/syden-peertube" ];
+      paths = [ config.secrets.fullPaths."websites/syden/peertube" ];
     };
 
     systemd.services.syden_peertube = {
@@ -86,7 +83,7 @@ in
 
       script = ''
         install -m 0750 -d ${dataDir}/config
-        ln -sf /var/secrets/webapps/syden-peertube ${dataDir}/config/production.yaml
+        ln -sf ${config.secrets.fullPaths."websites/syden/peertube"} ${dataDir}/config/production.yaml
         ln -sf ${package}/config/default.yaml ${dataDir}/config/default.yaml
         exec npm run start
       '';
@@ -109,11 +106,12 @@ in
     };
 
     services.websites.env.production.vhostConfs.syden_peertube = {
-      certName    = "eldiron";
-      addToCerts  = true;
-      hosts       = [ "syden.immae.eu" ];
-      root        = null;
-      extraConfig = [ ''
+      certName     = "syden";
+      addToCerts   = true;
+      certMainHost = "record-links.immae.eu";
+      hosts        = [ "record-links.immae.eu" ];
+      root         = null;
+      extraConfig  = [ ''
           RewriteEngine On
 
           RewriteCond %{REQUEST_URI}  ^/socket.io            [NC]