Use attrs for secrets instead of lists

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / tools / ttrss.nix

diff --git a/modules/private/websites/tools/tools/ttrss.nix b/modules/private/websites/tools/tools/ttrss.nix
index 48876d3ebf2a8d40cc4194929ac9a25ba0910009..f6abae9afe7a260640dff110e51613746a529e94 100644 (file)
--- a/modules/private/websites/tools/tools/ttrss.nix
+++ b/modules/private/websites/tools/tools/ttrss.nix
@@ -1,4 +1,4 @@
-{ php, env, ttrss, ttrss-plugins }:
+{ php, env, ttrss, ttrss-plugins, config }:
 rec {
   backups = {
     rootDir = varDir;
@@ -19,8 +19,7 @@ rec {
       install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
     '';
   };
-  keys = [{
-    dest = "webapps/tools-ttrss";
+  keys."webapps/tools-ttrss" = {
     user = apache.user;
     group = apache.group;
     permissions = "0400";
@@ -87,8 +86,12 @@ rec {
         define('LDAP_AUTH_LOG_ATTEMPTS', FALSE);
         define('LDAP_AUTH_DEBUG', FALSE);
       '';
-  }];
-  webRoot = (ttrss.override { ttrss_config = "/var/secrets/webapps/tools-ttrss"; }).withPlugins (builtins.attrValues ttrss-plugins);
+  };
+  webRoot = (ttrss.override { ttrss_config = config.secrets.fullPaths."webapps/tools-ttrss"; }).withPlugins (p: [
+    p.auth_ldap p.ff_instagram p.tumblr_gdpr_ua
+    (p.af_feedmod.override { patched = true; })
+    (p.feediron.override { patched = true; })
+  ]);
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
@@ -112,7 +115,7 @@ rec {
   phpFpm = rec {
     serviceDeps = [ "postgresql.service" "openldap.service" ];
     basedir = builtins.concatStringsSep ":" (
-      [ webRoot "/var/secrets/webapps/tools-ttrss" varDir ]
+      [ webRoot config.secrets.fullPaths."webapps/tools-ttrss" varDir ]
       ++ webRoot.plugins);
     pool = {
       "listen.owner" = apache.user;