···

       
1929
       
1929
       
 
       
      </listitem>

     

       
1930
       
1930
       
 
       
      <listitem>

     

       
1931
       
1931
       
 
       
        <para>

     

       
1932
       
1932
       
+
       
          Peertube now uses services.redis.servers to start a new redis

     

       
1933
       
1933
       
+
       
          server, instead of using a global redis server. This improves

     

       
1934
       
1934
       
+
       
          compatibility with other services that use redis.

     

       
1935
       
1935
       
+
       
        </para>

     

       
1936
       
1936
       
+
       
        <para>

     

       
1937
       
1937
       
+
       
          Redis database is used for storage only cache and job queue.

     

       
1938
       
1938
       
+
       
          More information can be found here -

     

       
1939
       
1939
       
+
       
          <link xlink:href="https://docs.joinpeertube.org/contribute-architecture">Peertube

     

       
1940
       
1940
       
+
       
          architecture</link>.

     

       
1941
       
1941
       
+
       
        </para>

     

       
1942
       
1942
       
+
       
        <para>

     

       
1943
       
1943
       
+
       
          If you do want to save the redis database, you can use the

     

       
1944
       
1944
       
+
       
          following commands before upgrade OS:

     

       
1945
       
1945
       
+
       
        </para>

     

       
1946
       
1946
       
+
       
        <programlisting language="bash">

     

       
1947
       
1947
       
+
       
redis-cli save

     

       
1948
       
1948
       
+
       
sudo mkdir /var/lib/redis-peertube

     

       
1949
       
1949
       
+
       
sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb

     

       
1950
       
1950
       
+
       
</programlisting>

     

       
1951
       
1951
       
+
       
      </listitem>

     

       
1952
       
1952
       
+
       
      <listitem>

     

       
1953
       
1953
       
+
       
        <para>

     

       
1932
       
1954
       
 
       
          If you are using Wayland you can choose to use the Ozone

     

       
1933
       
1955
       
 
       
          Wayland support in Chrome and several Electron apps by setting

     

       
1934
       
1956
       
 
       
          the environment variable <literal>NIXOS_OZONE_WL=1</literal>

     

···

       
718
       
718
       
 
       
  redis-cli save

     

       
719
       
719
       
 
       
  cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb"

     

       
720
       
720
       
 
       
  ```

     

       
721
       
721
       
+
       
- Peertube now uses services.redis.servers to start a new redis server, instead of using a global redis server.

     

       
722
       
722
       
+
       
  This improves compatibility with other services that use redis.

     

       
723
       
723
       
+
       


     

       
724
       
724
       
+
       
  Redis database is used for storage only cache and job queue. More information can be found here - [Peertube architecture](https://docs.joinpeertube.org/contribute-architecture).

     

       
725
       
725
       
+
       


     

       
726
       
726
       
+
       
  If you do want to save the redis database, you can use the following commands before upgrade OS:

     

       
727
       
727
       
+
       
  ```bash

     

       
728
       
728
       
+
       
  redis-cli save

     

       
729
       
729
       
+
       
  sudo mkdir /var/lib/redis-peertube

     

       
730
       
730
       
+
       
  sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb

     

       
731
       
731
       
+
       
  ```

     

       
721
       
732
       
 
       


     

       
722
       
733
       
 
       
- If you are using Wayland you can choose to use the Ozone Wayland support

     

       
723
       
734
       
 
       
  in Chrome and several Electron apps by setting the environment variable

     

···

       
209
       
209
       
 
       


     

       
210
       
210
       
 
       
      port = lib.mkOption {

     

       
211
       
211
       
 
       
        type = lib.types.nullOr lib.types.port;

     

       
212
       
212
       
-
       
        default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 6379;

     

       
212
       
212
       
+
       
        default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 31638;

     

       
213
       
213
       
 
       
        defaultText = lib.literalExpression ''

     

       
214
       
214
       
 
       
          if config.${opt.redis.createLocally} && config.${opt.redis.enableUnixSocket}

     

       
215
       
215
       
 
       
          then null

     
···

       
344
       
344
       
 
       
          };

     

       
345
       
345
       
 
       
        };

     

       
346
       
346
       
 
       
      }

     

       
347
       
347
       
-
       
      (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; })

     

       
347
       
347
       
+
       
      (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis-peertube/redis.sock"; }; })

     

       
348
       
348
       
 
       
    ];

     

       
349
       
349
       
 
       


     

       
350
       
350
       
 
       
    systemd.tmpfiles.rules = [

     
···

       
441
       
441
       
 
       
      enable = true;

     

       
442
       
442
       
 
       
    };

     

       
443
       
443
       
 
       


     

       
444
       
444
       
-
       
    services.redis = lib.mkMerge [

     

       
444
       
444
       
+
       
    services.redis.servers.peertube = lib.mkMerge [

     

       
445
       
445
       
 
       
      (lib.mkIf cfg.redis.createLocally {

     

       
446
       
446
       
 
       
        enable = true;

     

       
447
       
447
       
 
       
      })

     

       
448
       
448
       
+
       
      (lib.mkIf (cfg.redis.createLocally && !cfg.redis.enableUnixSocket) {

     

       
449
       
449
       
+
       
        bind = "127.0.0.1";

     

       
450
       
450
       
+
       
        port = cfg.redis.port;

     

       
451
       
451
       
+
       
      })

     

       
448
       
452
       
 
       
      (lib.mkIf (cfg.redis.createLocally && cfg.redis.enableUnixSocket) {

     

       
449
       
449
       
-
       
        unixSocket = "/run/redis/redis.sock";

     

       
450
       
450
       
-
       
        unixSocketPerm = 770;

     

       
453
       
453
       
+
       
        unixSocket = "/run/redis-peertube/redis.sock";

     

       
454
       
454
       
+
       
        unixSocketPerm = 660;

     

       
451
       
455
       
 
       
      })

     

       
452
       
456
       
 
       
    ];

     

       
453
       
457
       
 
       


     
···

       
465
       
469
       
 
       
        };

     

       
466
       
470
       
 
       
      })

     

       
467
       
471
       
 
       
      (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs-16_x pkgs.yarn ])

     

       
468
       
468
       
-
       
      (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis" ];})

     

       
472
       
472
       
+
       
      (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})

     

       
469
       
473
       
 
       
    ];

     

       
470
       
474
       
 
       


     

       
471
       
475
       
 
       
    users.groups = lib.optionalAttrs (cfg.group == "peertube") {

     

···

       
11
       
11
       
 
       
            { address = "192.168.2.10"; prefixLength = 24; }

     

       
12
       
12
       
 
       
          ];

     

       
13
       
13
       
 
       
        };

     

       
14
       
14
       
-
       
        firewall.allowedTCPPorts = [ 5432 6379 ];

     

       
14
       
14
       
+
       
        firewall.allowedTCPPorts = [ 5432 31638 ];

     

       
15
       
15
       
 
       
      };

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
      services.postgresql = {

     
···

       
34
       
34
       
 
       
        enable = true;

     

       
35
       
35
       
 
       
        bind = "0.0.0.0";

     

       
36
       
36
       
 
       
        requirePass = "turrQfaQwnanGbcsdhxy";

     

       
37
       
37
       
-
       
        port = 6379;

     

       
37
       
37
       
+
       
        port = 31638;

     

       
38
       
38
       
 
       
      };

     

       
39
       
39
       
 
       
    };

     

       
40
       
40
       
 
       


     
···

       
76
       
76
       
 
       


     

       
77
       
77
       
 
       
        redis = {

     

       
78
       
78
       
 
       
          host = "192.168.2.10";

     

       
79
       
79
       
+
       
          port = 31638;

     

       
79
       
80
       
 
       
          passwordFile = "/etc/peertube/password-redis-db";

     

       
80
       
81
       
 
       
        };

     

       
81
       
82
       
 
       


     
···

       
113
       
114
       
 
       
    database.wait_for_unit("redis-peertube.service")

     

       
114
       
115
       
 
       


     

       
115
       
116
       
 
       
    database.wait_for_open_port(5432)

     

       
116
       
116
       
-
       
    database.wait_for_open_port(6379)

     

       
117
       
117
       
+
       
    database.wait_for_open_port(31638)

     

       
117
       
118
       
 
       


     

       
118
       
119
       
 
       
    server.wait_for_unit("peertube.service")

     

       
119
       
120
       
 
       
    server.wait_for_open_port(9000)