diff options
author | Milo Gertjejansen <milo@milogert.com> | 2021-07-28 20:53:38 -0400 |
---|---|---|
committer | Milo Gertjejansen <milo@milogert.com> | 2021-07-28 20:53:38 -0400 |
commit | 7aa2bf302ae563453b010cc27ea66affb055b26e (patch) | |
tree | 4607059fda5d87cae9085c9a52c0bbd2d1d2f682 /nixos | |
parent | b0b71138c81448bc56784275f98fa79aecdd412a (diff) | |
download | nixpkgs-7aa2bf302ae563453b010cc27ea66affb055b26e.tar nixpkgs-7aa2bf302ae563453b010cc27ea66affb055b26e.tar.gz nixpkgs-7aa2bf302ae563453b010cc27ea66affb055b26e.tar.bz2 nixpkgs-7aa2bf302ae563453b010cc27ea66affb055b26e.tar.lz nixpkgs-7aa2bf302ae563453b010cc27ea66affb055b26e.tar.xz nixpkgs-7aa2bf302ae563453b010cc27ea66affb055b26e.tar.zst nixpkgs-7aa2bf302ae563453b010cc27ea66affb055b26e.zip |
Added more detail to changelog, updated permissions in directory, and changed restartTriggers
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 7 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/tt-rss.nix | 10 |
3 files changed, 10 insertions, 9 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 31031a2d2e7..c78c99cb647 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -558,9 +558,12 @@ <listitem> <para> <literal>tt-rss</literal> was upgraded to the commit on - 2021-06-21, which has breaking changes, see + 2021-06-21, which has breaking changes. If you use + <literal>services.tt-rss.extraConfig</literal> you should + migrate to the <literal>putenv</literal>-style configuration. + See <link xlink:href="https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337">this - thread</link> in the tt-rss forums for details. + Discourse post</link> in the tt-rss forums for more details. </para> </listitem> </itemizedlist> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 5a6bf727c03..eb45c9bf747 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -142,7 +142,7 @@ pt-services.clipcat.enable). - the `mingw-64` package has been upgraded from 6.0.0 to 9.0.0 -- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes, see [this thread](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for details. +- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes. If you use `services.tt-rss.extraConfig` you should migrate to the `putenv`-style configuration. See [this Discourse post](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for more details. ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 676683a557d..7a6dc5f0a4e 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -568,9 +568,7 @@ let systemd.services = { phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") { - restartTriggers = [ - cfg.root - ]; + restartTriggers = [ tt-rss-config tt-rss ]; }; tt-rss = { @@ -611,9 +609,9 @@ let ''} ln -sf "${tt-rss-config}" "${cfg.root}/config.php" chmod -R 755 "${cfg.root}" - chmod -R 777 "${cfg.root}/${lockDir}" - chmod -R 777 "${cfg.root}/${cacheDir}" - chmod -R 777 "${cfg.root}/${feedIconsDir}" + chmod -R ug+rwX "${cfg.root}/${lockDir}" + chmod -R ug+rwX "${cfg.root}/${cacheDir}" + chmod -R ug+rwX "${cfg.root}/${feedIconsDir}" '' + (optionalString (cfg.database.type == "pgsql") '' |