X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fpapa%2Fmaison_bbc.nix;h=5fbc62f6abc85407652db54ed709f749081032c7;hb=f5761aac8dbfb4af91c232f2b52d1353c899abda;hp=7295de81a01120707bfdc726017e805db37fbded;hpb=9a414bd66ff06cade504ac34f13dbeddac48150a;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 7295de8..5fbc62f 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,22 +11,22 @@ in {
services.duplyBackup.profiles.papa_maison_bbc.rootDir = varDir;
services.webstats.sites = [ { name = "maison.bbc.bouya.org"; } ];
services.phpfpm.pools.papa_maison_bbc = {
- listen = "/run/phpfpm/papa_maison_bbc.sock";
- extraConfig = ''
- user = wwwrun
- group = wwwrun
- listen.owner = wwwrun
- listen.group = wwwrun
+ user = apacheUser;
+ group = apacheGroup;
+ settings = {
+ "listen.owner" = apacheUser;
+ "listen.group" = apacheGroup;
- pm = ondemand
- pm.max_children = 5
- pm.process_idle_timeout = 60
+ "pm" = "ondemand";
+ "pm.max_children" = "5";
+ "pm.process_idle_timeout" = "60";
- php_admin_value[open_basedir] = "${varDir}"
- '';
+ "php_admin_value[open_basedir]" = varDir;
+ };
phpOptions = config.services.phpfpm.phpOptions + ''
- extension=${pkgs.php}/lib/php/extensions/mysqli.so
- '';
+ date.timezone = 'Europe/Paris'
+ '';
+ phpPackage = pkgs.php72;
};
services.websites.env.production.modules = [ "proxy_fcgi" ];
@@ -33,14 +35,20 @@ in {
root = varDir;
extraConfig = [
''
+ Alias /.well-known/acme-challenge ${config.security.acme.certs.papa.webroot}/.well-known/acme-challenge
RedirectMatch 301 ^/((?!(\.well-known|add.php).*$).*)$ https://maison.bbc.bouya.org/$1
DirectoryIndex index.php index.htm index.html
AllowOverride None
Require all granted
- SetHandler "proxy:unix:/run/phpfpm/papa_maison_bbc.sock|fcgi://localhost"
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.papa_maison_bbc.socket}|fcgi://localhost"
+
+
+ Options Indexes FollowSymLinks
+ AllowOverride None
+ Require all granted
''
];
@@ -50,6 +58,7 @@ in {
addToCerts = true;
hosts = [ "maison.bbc.bouya.org" ];
root = varDir;
+ forceSSL = false;
extraConfig = [
''
@@ -57,7 +66,7 @@ in {
AllowOverride None
Require all granted
- SetHandler "proxy:unix:/run/phpfpm/papa_maison_bbc.sock|fcgi://localhost"
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.papa_maison_bbc.socket}|fcgi://localhost"
''