X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fpapa%2Fsurveillance.nix;h=a8e51499c5133a0abc57968a6e1202a7bc35cf55;hb=d3452fc59b9839846225fd254926c64a9c71f071;hp=f6e17721e8d61c68ca256f193a4f3a93864928af;hpb=981fa80354fd6f00f49446777c38f77bd8a65f65;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/papa/surveillance.nix b/modules/private/websites/papa/surveillance.nix
index f6e1772..a8e5149 100644
--- a/modules/private/websites/papa/surveillance.nix
+++ b/modules/private/websites/papa/surveillance.nix
@@ -2,11 +2,12 @@
 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.acme2.certs."ftp".extraDomains."surveillance.maison.bbc.bouya.org" = null;
+    security.acme.certs."ftp".extraDomains."surveillance.maison.bbc.bouya.org" = null;
 
     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" ];