X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fpapa%2Fmaison_bbc.nix;h=aa6d86669578208dafa55e859fe053381dd3cd53;hb=cfda3cfc35445979225850f686f338e6d4ace372;hp=9576a9ec0fe8b8547e8da204edab0228ea683eec;hpb=e7b890d0999fe54a99f84fe92d625d9d488358dc;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/papa/maison_bbc.nix b/modules/private/websites/papa/maison_bbc.nix
index 9576a9e..aa6d866 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";
@@ -23,8 +25,8 @@ in {
};
phpOptions = config.services.phpfpm.phpOptions + ''
date.timezone = 'Europe/Paris'
- extension=${pkgs.php}/lib/php/extensions/mysqli.so
- '';
+ '';
+ phpPackage = pkgs.php72;
};
services.websites.env.production.modules = [ "proxy_fcgi" ];
@@ -33,7 +35,7 @@ in {
root = varDir;
extraConfig = [
''
- Alias /.well-known/acme-challenge ${config.security.acme.certs.papa.webroot}/.well-known/acme-challenge
+ Alias /.well-known/acme-challenge ${config.myServices.certificates.webroot}/.well-known/acme-challenge
RedirectMatch 301 ^/((?!(\.well-known|add.php).*$).*)$ https://maison.bbc.bouya.org/$1
DirectoryIndex index.php index.htm index.html
@@ -43,7 +45,7 @@ in {
SetHandler "proxy:unix:${config.services.phpfpm.pools.papa_maison_bbc.socket}|fcgi://localhost"
-
+
Options Indexes FollowSymLinks
AllowOverride None
Require all granted