X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;fp=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=7903ca55984a51d997d773510e30dbe154796e33;hp=1e30eed4affaf0770ba0d6d91d5054106c93509e;hb=0966f95c6968963988d7ebc846eb0e6087091acc;hpb=31d99b750fca57c660f98e23e12053eaf42d4929 diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 1e30eed..7903ca5 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix @@ -55,6 +55,9 @@ let dmarc-reports = pkgs.callPackage ./dmarc_reports.nix { env = config.myEnv.tools.dmarc_reports; }; + csp-reports = pkgs.callPackage ./csp_reports.nix { + env = config.myEnv.tools.csp_reports; + }; landing = pkgs.callPackage ./landing.nix {}; @@ -74,6 +77,7 @@ in { ++ wallabag.keys ++ yourls.keys ++ dmarc-reports.keys + ++ csp-reports.keys ++ webhooks.keys; services.duplyBackup.profiles = { @@ -302,11 +306,10 @@ in { "/run/wrappers/bin/sendmail" landing "/tmp" "${config.secrets.location}/webapps/webhooks" ]; + "include" = "${config.secrets.location}/webapps/tools-csp-reports.conf"; }; phpEnv = { CONTACT_EMAIL = config.myEnv.tools.contact; - CSP_REPORT_URI = with config.myEnv.tools.csp_reports.postgresql; - "\"host=${socket} dbname=${database} user=${user} password=${password}\""; }; phpPackage = pkgs.php72; };