X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fttrss.nix;h=76105be615c35f67aff5602700d6c46db16d80fb;hb=9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d;hp=2659afddbb285c4746c9ff0d6a551ef4f462992a;hpb=0f3047a77ee1e0b3d943e39d50301ba85821c572;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/modules/websites/tools/tools/ttrss.nix b/virtual/modules/websites/tools/tools/ttrss.nix
index 2659afd..76105be 100644
--- a/virtual/modules/websites/tools/tools/ttrss.nix
+++ b/virtual/modules/websites/tools/tools/ttrss.nix
@@ -1,4 +1,4 @@
-{ lib, php, checkEnv, writeText, stdenv, fetchedGit, fetchedGithub }:
+{ lib, php, env, writeText, stdenv, fetchedGit, fetchedGithub }:
 let
   ttrss = let
     plugins = {
@@ -52,10 +52,7 @@ let
         install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
       '';
     };
-    config =
-      assert checkEnv "NIXOPS_TTRSS_DB_PASSWORD";
-      assert checkEnv "NIXOPS_TTRSS_LDAP_PASSWORD";
-      writeText "config.php" ''
+    config = writeText "config.php" ''
       <?php
 
         define('PHP_EXECUTABLE', '${php}/bin/php');
@@ -72,7 +69,7 @@ let
         define('DB_HOST', 'db-1.immae.eu');
         define('DB_USER', 'ttrss');
         define('DB_NAME', 'ttrss');
-        define('DB_PASS', '${builtins.getEnv "NIXOPS_TTRSS_DB_PASSWORD"}');
+        define('DB_PASS', '${env.postgresql.password}');
         define('DB_PORT', '5432');
 
         define('AUTH_AUTO_CREATE', true);
@@ -117,7 +114,7 @@ let
         define('LDAP_AUTH_SEARCHFILTER', '(&(memberOf=cn=users,cn=ttrss,ou=services,dc=immae,dc=eu)(|(cn=???)(uid=???)(&(uid:dn:=???)(ou=ttrss))))');
 
         define('LDAP_AUTH_BINDDN', 'cn=ttrss,ou=services,dc=immae,dc=eu');
-        define('LDAP_AUTH_BINDPW', '${builtins.getEnv "NIXOPS_TTRSS_LDAP_PASSWORD"}');
+        define('LDAP_AUTH_BINDPW', '${env.ldap.password}');
         define('LDAP_AUTH_LOGIN_ATTRIB', 'immaeTtrssLogin');
 
         define('LDAP_AUTH_LOG_ATTEMPTS', FALSE);