diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-02-07 23:19:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-07 23:19:57 +0100 |
commit | ded6a6cb804bb3b6938e52817a2a40dce89359a9 (patch) | |
tree | 9b555d3813c8903a953de7ead0f2df6ef458e946 /nixos/modules/services/web-apps/tt-rss.nix | |
parent | ad2dfe1ef433b18ba26166fb6cae720f66bbe48a (diff) | |
parent | 106626b8d7fb3708e72d566d843fa78f0a294022 (diff) | |
download | nixlib-ded6a6cb804bb3b6938e52817a2a40dce89359a9.tar nixlib-ded6a6cb804bb3b6938e52817a2a40dce89359a9.tar.gz nixlib-ded6a6cb804bb3b6938e52817a2a40dce89359a9.tar.bz2 nixlib-ded6a6cb804bb3b6938e52817a2a40dce89359a9.tar.lz nixlib-ded6a6cb804bb3b6938e52817a2a40dce89359a9.tar.xz nixlib-ded6a6cb804bb3b6938e52817a2a40dce89359a9.tar.zst nixlib-ded6a6cb804bb3b6938e52817a2a40dce89359a9.zip |
Merge pull request #277137 from ajs124/fix/tt-rss-phpPackage
nixos/tt-rss: add phpPackage option
Diffstat (limited to 'nixos/modules/services/web-apps/tt-rss.nix')
-rw-r--r-- | nixos/modules/services/web-apps/tt-rss.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 6c9b4bd1b8a7..84342165c9c0 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.tt-rss; + inherit (cfg) phpPackage; + configVersion = 26; dbPort = if cfg.database.port == null @@ -26,7 +28,7 @@ let ; in pkgs.writeText "config.php" '' <?php - putenv('TTRSS_PHP_EXECUTABLE=${pkgs.php}/bin/php'); + putenv('TTRSS_PHP_EXECUTABLE=${phpPackage}/bin/php'); putenv('TTRSS_LOCK_DIRECTORY=${cfg.root}/lock'); putenv('TTRSS_CACHE_DIR=${cfg.root}/cache'); @@ -456,6 +458,15 @@ let ''; }; + phpPackage = lib.mkOption { + type = lib.types.package; + default = pkgs.php; + defaultText = "pkgs.php"; + description = lib.mdDoc '' + php package to use for php fpm and update daemon. + ''; + }; + plugins = mkOption { type = types.listOf types.str; default = ["auth_internal" "note"]; @@ -543,7 +554,7 @@ let services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { ${poolName} = { inherit (cfg) user; - phpPackage = pkgs.php81; + inherit phpPackage; settings = mapAttrs (name: mkDefault) { "listen.owner" = "nginx"; "listen.group" = "nginx"; @@ -605,13 +616,13 @@ let description = "Tiny Tiny RSS feeds update daemon"; preStart = '' - ${pkgs.php81}/bin/php ${cfg.root}/www/update.php --update-schema --force-yes + ${phpPackage}/bin/php ${cfg.root}/www/update.php --update-schema --force-yes ''; serviceConfig = { User = "${cfg.user}"; Group = "tt_rss"; - ExecStart = "${pkgs.php}/bin/php ${cfg.root}/www/update.php --daemon --quiet"; + ExecStart = "${phpPackage}/bin/php ${cfg.root}/www/update.php --daemon --quiet"; Restart = "on-failure"; RestartSec = "60"; SyslogIdentifier = "tt-rss"; |