Use peertube flake in modules

[perso/Immae/Config/Nix.git] / modules / private / websites / syden / peertube.nix

diff --git a/modules/private/websites/syden/peertube.nix b/modules/private/websites/syden/peertube.nix
index 2ad72175130e9e0322f75ce002d6e0e1c30b77ed..aa465d711e1cdfe9afaa81f7f1d83b5634ab1210 100644 (file)
--- 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.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
 {
@@ -12,6 +12,7 @@ in
   config = lib.mkIf scfg.enable {
     services.duplyBackup.profiles.syden_peertube = {
       rootDir = dataDir;
+      remotes = ["eriomem" "ovh"];
     };
     users.users.peertube = {
       uid = config.ids.uids.peertube;
@@ -23,7 +24,7 @@ in
     users.groups.peertube.gid = config.ids.gids.peertube;
 
     secrets.keys = [{
-      dest = "webapps/syden-peertube";
+      dest = "websites/syden/peertube";
       user = "peertube";
       group = "peertube";
       permissions = "0640";
@@ -33,7 +34,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 +65,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 +88,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 +111,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]