From 059006b84b3c1a6d987e9f09bcaf356c99c2ed6f Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 20 May 2023 19:58:07 +0900 Subject: nixos/epgstation: add required directories to tmpfiles.d --- nixos/modules/services/video/epgstation/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'nixos') diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index a395294ec14..78826e048f2 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -308,9 +308,15 @@ in ]; systemd.tmpfiles.rules = [ + "d '/var/lib/epgstation/key' - ${username} ${groupname} - -" "d '/var/lib/epgstation/streamfiles' - ${username} ${groupname} - -" + "d '/var/lib/epgstation/drop' - ${username} ${groupname} - -" "d '/var/lib/epgstation/recorded' - ${username} ${groupname} - -" "d '/var/lib/epgstation/thumbnail' - ${username} ${groupname} - -" + "d '/var/lib/epgstation/db/subscribers' - ${username} ${groupname} - -" + "d '/var/lib/epgstation/db/migrations/mysql' - ${username} ${groupname} - -" + "d '/var/lib/epgstation/db/migrations/postgres' - ${username} ${groupname} - -" + "d '/var/lib/epgstation/db/migrations/sqlite' - ${username} ${groupname} - -" ]; systemd.services.epgstation = { -- cgit 1.4.1 From 94eb60a7d21f3fb594de4f5a5ac40cf24779881d Mon Sep 17 00:00:00 2001 From: midchildan Date: Wed, 17 Aug 2022 18:50:46 +0900 Subject: nixos/epgstation: add a new option 'ffmpeg' Closes #187120. --- nixos/modules/services/video/epgstation/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 78826e048f2..fca483b0dbd 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -80,11 +80,11 @@ in options.services.epgstation = { enable = lib.mkEnableOption (lib.mdDoc description); - package = lib.mkOption { - default = pkgs.epgstation; - type = lib.types.package; - defaultText = lib.literalExpression "pkgs.epgstation"; - description = lib.mdDoc "epgstation package to use"; + package = lib.mkPackageOptionMD pkgs "epgstation" { }; + + ffmpeg = lib.mkPackageOptionMD pkgs "ffmpeg" { + default = [ "ffmpeg-headless" ]; + example = "pkgs.ffmpeg-full"; }; usePreconfiguredStreaming = lib.mkOption { @@ -278,6 +278,8 @@ in package = lib.mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; # FIXME: enable once mysqljs supports auth_socket + # https://github.com/mysqljs/mysql/issues/1507 + # # ensureUsers = [ { # name = username; # ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; @@ -295,8 +297,8 @@ in database = cfg.database.name; }; - ffmpeg = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg"; - ffprobe = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe"; + ffmpeg = lib.mkDefault "${cfg.ffmpeg}/bin/ffmpeg"; + ffprobe = lib.mkDefault "${cfg.ffmpeg}/bin/ffprobe"; # for disambiguation with TypeScript files recordedFileExtension = lib.mkDefault ".m2ts"; -- cgit 1.4.1