diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 19aaf12f26a1..40b467206252 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -1925,6 +1925,28 @@
redis-cli save
cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb"
+
+
+
+
+ Peertube now uses services.redis.servers to start a new redis
+ server, instead of using a global redis server. This improves
+ compatibility with other services that use redis.
+
+
+ Redis database is used for storage only cache and job queue.
+ More information can be found here -
+ Peertube
+ architecture.
+
+
+ If you do want to save the redis database, you can use the
+ following commands before upgrade OS:
+
+
+redis-cli save
+sudo mkdir /var/lib/redis-peertube
+sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 9261511e7b8c..1d292cb737d4 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -718,6 +718,17 @@ In addition to numerous new and upgraded packages, this release has the followin
redis-cli save
cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb"
```
+- Peertube now uses services.redis.servers to start a new redis server, instead of using a global redis server.
+ This improves compatibility with other services that use redis.
+
+ 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).
+
+ If you do want to save the redis database, you can use the following commands before upgrade OS:
+ ```bash
+ redis-cli save
+ sudo mkdir /var/lib/redis-peertube
+ sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
+ ```
- If you are using Wayland you can choose to use the Ozone Wayland support
in Chrome and several Electron apps by setting the environment variable
diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix
index e195e6e6e824..e6b6aa273e7f 100644
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -209,7 +209,7 @@ in {
port = lib.mkOption {
type = lib.types.nullOr lib.types.port;
- default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 6379;
+ default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 31638;
defaultText = lib.literalExpression ''
if config.${opt.redis.createLocally} && config.${opt.redis.enableUnixSocket}
then null
@@ -344,7 +344,7 @@ in {
};
};
}
- (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; })
+ (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis-peertube/redis.sock"; }; })
];
systemd.tmpfiles.rules = [
@@ -441,13 +441,17 @@ in {
enable = true;
};
- services.redis = lib.mkMerge [
+ services.redis.servers.peertube = lib.mkMerge [
(lib.mkIf cfg.redis.createLocally {
enable = true;
})
+ (lib.mkIf (cfg.redis.createLocally && !cfg.redis.enableUnixSocket) {
+ bind = "127.0.0.1";
+ port = cfg.redis.port;
+ })
(lib.mkIf (cfg.redis.createLocally && cfg.redis.enableUnixSocket) {
- unixSocket = "/run/redis/redis.sock";
- unixSocketPerm = 770;
+ unixSocket = "/run/redis-peertube/redis.sock";
+ unixSocketPerm = 660;
})
];
@@ -465,7 +469,7 @@ in {
};
})
(lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs-16_x pkgs.yarn ])
- (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis" ];})
+ (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})
];
users.groups = lib.optionalAttrs (cfg.group == "peertube") {
diff --git a/nixos/tests/web-apps/peertube.nix b/nixos/tests/web-apps/peertube.nix
index d42b4e3d677b..ecc45bff2e2c 100644
--- a/nixos/tests/web-apps/peertube.nix
+++ b/nixos/tests/web-apps/peertube.nix
@@ -11,7 +11,7 @@ import ../make-test-python.nix ({pkgs, ...}:
{ address = "192.168.2.10"; prefixLength = 24; }
];
};
- firewall.allowedTCPPorts = [ 5432 6379 ];
+ firewall.allowedTCPPorts = [ 5432 31638 ];
};
services.postgresql = {
@@ -34,7 +34,7 @@ import ../make-test-python.nix ({pkgs, ...}:
enable = true;
bind = "0.0.0.0";
requirePass = "turrQfaQwnanGbcsdhxy";
- port = 6379;
+ port = 31638;
};
};
@@ -76,6 +76,7 @@ import ../make-test-python.nix ({pkgs, ...}:
redis = {
host = "192.168.2.10";
+ port = 31638;
passwordFile = "/etc/peertube/password-redis-db";
};
@@ -113,7 +114,7 @@ import ../make-test-python.nix ({pkgs, ...}:
database.wait_for_unit("redis-peertube.service")
database.wait_for_open_port(5432)
- database.wait_for_open_port(6379)
+ database.wait_for_open_port(31638)
server.wait_for_unit("peertube.service")
server.wait_for_open_port(9000)