From da30ae4ffdd153a1eb32fb86f9ca9a65aa19e4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 13 Oct 2021 02:26:54 +0200 Subject: Move secrets to flakes --- modules/private/websites/tools/dav/davical.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/private/websites/tools/dav/davical.nix') diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix index 9d6cd21..eeac1b5 100644 --- a/modules/private/websites/tools/dav/davical.nix +++ b/modules/private/websites/tools/dav/davical.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, writeText, env, awl, davical }: +{ stdenv, fetchurl, gettext, writeText, env, awl, davical, config }: rec { activationScript = { deps = [ "httpd" ]; @@ -65,7 +65,7 @@ rec { include('drivers_ldap.php'); ''; }]; - webapp = davical.override { davical_config = "/var/secrets/webapps/dav-davical"; }; + webapp = davical.override { davical_config = config.secrets.fullPaths."webapps/dav-davical"; }; webRoot = "${webapp}/htdocs"; apache = rec { user = "wwwrun"; @@ -110,7 +110,7 @@ rec { }; phpFpm = rec { serviceDeps = [ "postgresql.service" "openldap.service" ]; - basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ]; + basedir = builtins.concatStringsSep ":" [ webapp config.secrets.fullPaths."webapps/dav-davical" awl ]; pool = { "listen.owner" = apache.user; "listen.group" = apache.group; -- cgit v1.2.3