diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-18 16:10:56 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-20 01:51:48 +0200 |
commit | d3452fc59b9839846225fd254926c64a9c71f071 (patch) | |
tree | a98a0958b826ac4b2ab137720edf0195c65dd958 /modules/private/websites/papa | |
parent | 514f9ec3beec470c4445be690673a0ceab9115b4 (diff) | |
download | Nix-d3452fc59b9839846225fd254926c64a9c71f071.tar.gz Nix-d3452fc59b9839846225fd254926c64a9c71f071.tar.zst Nix-d3452fc59b9839846225fd254926c64a9c71f071.zip |
Refactor websites
Diffstat (limited to 'modules/private/websites/papa')
-rw-r--r-- | modules/private/websites/papa/maison_bbc.nix | 10 | ||||
-rw-r--r-- | modules/private/websites/papa/surveillance.nix | 5 |
2 files changed, 9 insertions, 6 deletions
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 @@ | |||
2 | let | 2 | let |
3 | cfg = config.myServices.websites.papa.maison_bbc; | 3 | cfg = config.myServices.websites.papa.maison_bbc; |
4 | varDir = "/var/lib/ftp/papa/site"; | 4 | varDir = "/var/lib/ftp/papa/site"; |
5 | apacheUser = config.services.httpd.Prod.user; | ||
6 | apacheGroup = config.services.httpd.Prod.group; | ||
5 | in { | 7 | in { |
6 | options.myServices.websites.papa.maison_bbc.enable = lib.mkEnableOption "enable Papa Maison bbc website"; | 8 | options.myServices.websites.papa.maison_bbc.enable = lib.mkEnableOption "enable Papa Maison bbc website"; |
7 | 9 | ||
@@ -9,11 +11,11 @@ in { | |||
9 | services.duplyBackup.profiles.papa_maison_bbc.rootDir = varDir; | 11 | services.duplyBackup.profiles.papa_maison_bbc.rootDir = varDir; |
10 | services.webstats.sites = [ { name = "maison.bbc.bouya.org"; } ]; | 12 | services.webstats.sites = [ { name = "maison.bbc.bouya.org"; } ]; |
11 | services.phpfpm.pools.papa_maison_bbc = { | 13 | services.phpfpm.pools.papa_maison_bbc = { |
12 | user = "wwwrun"; | 14 | user = apacheUser; |
13 | group = "wwwrun"; | 15 | group = apacheGroup; |
14 | settings = { | 16 | settings = { |
15 | "listen.owner" = "wwwrun"; | 17 | "listen.owner" = apacheUser; |
16 | "listen.group" = "wwwrun"; | 18 | "listen.group" = apacheGroup; |
17 | 19 | ||
18 | "pm" = "ondemand"; | 20 | "pm" = "ondemand"; |
19 | "pm.max_children" = "5"; | 21 | "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 @@ | |||
2 | let | 2 | let |
3 | cfg = config.myServices.websites.papa.surveillance; | 3 | cfg = config.myServices.websites.papa.surveillance; |
4 | varDir = "/var/lib/ftp/papa"; | 4 | varDir = "/var/lib/ftp/papa"; |
5 | apacheUser = config.services.httpd.Prod.user; | ||
5 | in { | 6 | in { |
6 | options.myServices.websites.papa.surveillance.enable = lib.mkEnableOption "enable Papa surveillance's website"; | 7 | options.myServices.websites.papa.surveillance.enable = lib.mkEnableOption "enable Papa surveillance's website"; |
7 | 8 | ||
@@ -22,12 +23,12 @@ in { | |||
22 | in | 23 | in |
23 | [ | 24 | [ |
24 | '' | 25 | '' |
25 | 0 6 * * * wwwrun ${script} | 26 | 0 6 * * * ${apacheUser} ${script} |
26 | '' | 27 | '' |
27 | ]; | 28 | ]; |
28 | }; | 29 | }; |
29 | 30 | ||
30 | services.websites.env.production.vhostConfs.papa = { | 31 | services.websites.env.production.vhostConfs.papa_surveillance = { |
31 | certName = "papa"; | 32 | certName = "papa"; |
32 | certMainHost = "surveillance.maison.bbc.bouya.org"; | 33 | certMainHost = "surveillance.maison.bbc.bouya.org"; |
33 | hosts = [ "surveillance.maison.bbc.bouya.org" ]; | 34 | hosts = [ "surveillance.maison.bbc.bouya.org" ]; |