Ateliers du changement

[perso/Immae/Config/Nix.git] / modules / private / websites / papa / surveillance.nix

diff --git a/modules/private/websites/papa/surveillance.nix b/modules/private/websites/papa/surveillance.nix
index ca6bf9ea14badd154e98196edc8c96df003dcc57..9cf635b225e8cb54bf137360c578a5f8cc94e763 100644 (file)
--- a/modules/private/websites/papa/surveillance.nix
+++ b/modules/private/websites/papa/surveillance.nix
@@ -1,12 +1,13 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
   cfg = config.myServices.websites.papa.surveillance;
   varDir = "/var/lib/ftp/papa";
+  apacheUser = config.services.httpd.Prod.user;
 in {
   options.myServices.websites.papa.surveillance.enable = lib.mkEnableOption "enable Papa surveillance's website";
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."ftp".extraDomains."surveillance.maison.bbc.bouya.org" = null;
+    security.acme.certs."ftp".extraDomainNames = [ "surveillance.maison.bbc.bouya.org" ];
 
     services.cron = {
       systemCronJobs = let
@@ -22,12 +23,12 @@ in {
       in
         [
         ''
-          0 6 * * * wwwrun ${script}
+          0 6 * * * ${apacheUser} ${script}
         ''
       ];
     };
 
-    services.websites.env.production.vhostConfs.papa = {
+    services.websites.env.production.vhostConfs.papa_surveillance = {
       certName     = "papa";
       certMainHost = "surveillance.maison.bbc.bouya.org";
       hosts        = [ "surveillance.maison.bbc.bouya.org" ];