diff options
| author | Stig <stig@stig.io> | 2022-02-25 14:38:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-25 14:38:15 +0100 |
| commit | c1f6adfaa81142154131ab74f3e840fae42a9b21 (patch) | |
| tree | 0f2627e881afd47fc1bd491fd4d98fa452f9bb5f /nixos | |
| parent | ad8e86d72fb37e0d13024bdbfcb59fd51e94c286 (diff) | |
| parent | e0616741d1ea8d5cfdf368bf1ad6e99349284498 (diff) | |
| download | nixlib-c1f6adfaa81142154131ab74f3e840fae42a9b21.tar nixlib-c1f6adfaa81142154131ab74f3e840fae42a9b21.tar.gz nixlib-c1f6adfaa81142154131ab74f3e840fae42a9b21.tar.bz2 nixlib-c1f6adfaa81142154131ab74f3e840fae42a9b21.tar.lz nixlib-c1f6adfaa81142154131ab74f3e840fae42a9b21.tar.xz nixlib-c1f6adfaa81142154131ab74f3e840fae42a9b21.tar.zst nixlib-c1f6adfaa81142154131ab74f3e840fae42a9b21.zip | |
Merge pull request #154109 from Izorkin/update-peertube
peertube: 3.4.1 -> 4.1.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/peertube.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index a65428018260..e195e6e6e824 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -320,6 +320,7 @@ in { }; storage = { tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/"; + bin = lib.mkDefault "/var/lib/peertube/storage/bin/"; avatars = lib.mkDefault "/var/lib/peertube/storage/avatars/"; videos = lib.mkDefault "/var/lib/peertube/storage/videos/"; streaming_playlists = lib.mkDefault "/var/lib/peertube/storage/streaming-playlists/"; @@ -333,6 +334,15 @@ in { plugins = lib.mkDefault "/var/lib/peertube/storage/plugins/"; client_overrides = lib.mkDefault "/var/lib/peertube/storage/client-overrides/"; }; + import = { + videos = { + http = { + youtube_dl_release = { + python_path = "${pkgs.python3}/bin/python"; + }; + }; + }; + }; } (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; }) ]; @@ -380,7 +390,7 @@ in { environment = env; - path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn youtube-dl ]; + path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ]; script = '' #!/bin/sh |