From d3452fc59b9839846225fd254926c64a9c71f071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 18 Apr 2020 16:10:56 +0200
Subject: Refactor websites

---
 modules/private/websites/papa/maison_bbc.nix   | 10 ++++++----
 modules/private/websites/papa/surveillance.nix |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'modules/private/websites/papa')

diff --git a/modules/private/websites/papa/maison_bbc.nix b/modules/private/websites/papa/maison_bbc.nix
index 9576a9e..d94a027 100644
--- a/modules/private/websites/papa/maison_bbc.nix
+++ b/modules/private/websites/papa/maison_bbc.nix
@@ -2,6 +2,8 @@
 let
   cfg = config.myServices.websites.papa.maison_bbc;
   varDir = "/var/lib/ftp/papa/site";
+  apacheUser = config.services.httpd.Prod.user;
+  apacheGroup = config.services.httpd.Prod.group;
 in {
   options.myServices.websites.papa.maison_bbc.enable = lib.mkEnableOption "enable Papa Maison bbc website";
 
@@ -9,11 +11,11 @@ in {
     services.duplyBackup.profiles.papa_maison_bbc.rootDir = varDir;
     services.webstats.sites = [ { name = "maison.bbc.bouya.org"; } ];
     services.phpfpm.pools.papa_maison_bbc = {
-      user = "wwwrun";
-      group = "wwwrun";
+      user = apacheUser;
+      group = apacheGroup;
       settings = {
-        "listen.owner" = "wwwrun";
-        "listen.group" = "wwwrun";
+        "listen.owner" = apacheUser;
+        "listen.group" = apacheGroup;
 
         "pm" = "ondemand";
         "pm.max_children" = "5";
diff --git a/modules/private/websites/papa/surveillance.nix b/modules/private/websites/papa/surveillance.nix
index 1bb6ac8..a8e5149 100644
--- a/modules/private/websites/papa/surveillance.nix
+++ b/modules/private/websites/papa/surveillance.nix
@@ -2,6 +2,7 @@
 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";
 
@@ -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" ];
-- 
cgit v1.2.3