Add specification for the private config file as a module.

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

diff --git a/modules/private/websites/tools/peertube/default.nix b/modules/private/websites/tools/peertube/default.nix
index dd2853039a33db38beda72d1461cdbdd8e8ebed9..0bacfd1ebe48a4292db9c98654dfd3987f4b0b9c 100644 (file)
--- a/modules/private/websites/tools/peertube/default.nix
+++ b/modules/private/websites/tools/peertube/default.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
-  env = myconfig.env.tools.peertube;
+  env = config.myEnv.tools.peertube;
   cfg = config.myServices.websites.tools.peertube;
   pcfg = config.services.peertube;
 in {
@@ -9,6 +9,9 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    services.duplyBackup.profiles.peertube = {
+      rootDir = pcfg.dataDir;
+    };
     services.peertube = {
       enable = true;
       configFile = "/var/secrets/webapps/tools-peertube";
@@ -24,7 +27,7 @@ in {
       text = ''
         listen:
           hostname: 'localhost'
-          port: ${env.listenPort}
+          port: ${toString config.myEnv.ports.peertube}
         webserver:
           https: true
           hostname: 'peertube.immae.eu'
@@ -42,7 +45,7 @@ in {
         redis:
           socket: '${env.redis.socket}'
           auth: null
-          db: ${env.redis.db_index}
+          db: ${env.redis.db}
         ldap:
           enable: true
           ldap_only: false
@@ -150,7 +153,7 @@ in {
         '';
     }];
 
-    services.websites.tools.modules = [
+    services.websites.env.tools.modules = [
       "headers" "proxy" "proxy_http" "proxy_wstunnel"
     ];
     services.filesWatcher.peertube = {
@@ -158,7 +161,7 @@ in {
       paths = [ pcfg.configFile ];
     };
 
-    services.websites.tools.vhostConfs.peertube = {
+    services.websites.env.tools.vhostConfs.peertube = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = [ "peertube.immae.eu" ];
@@ -168,13 +171,13 @@ in {
 
           RewriteCond %{REQUEST_URI}  ^/socket.io            [NC]
           RewriteCond %{QUERY_STRING} transport=websocket    [NC]
-          RewriteRule /(.*)           ws://localhost:${env.listenPort}/$1 [P,NE,QSA,L]
+          RewriteRule /(.*)           ws://localhost:${toString env.listenPort}/$1 [P,NE,QSA,L]
 
           RewriteCond %{REQUEST_URI}  ^/tracker/socket       [NC]
-          RewriteRule /(.*)           ws://localhost:${env.listenPort}/$1 [P,NE,QSA,L]
+          RewriteRule /(.*)           ws://localhost:${toString env.listenPort}/$1 [P,NE,QSA,L]
 
-          ProxyPass /        http://localhost:${env.listenPort}/
-          ProxyPassReverse / http://localhost:${env.listenPort}/
+          ProxyPass /        http://localhost:${toString env.listenPort}/
+          ProxyPassReverse / http://localhost:${toString env.listenPort}/
 
           ProxyPreserveHost On
           RequestHeader set X-Real-IP %{REMOTE_ADDR}s