X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fleila%2Fproduction.nix;h=b48da6ff57ec773061d96b832ced21af33691013;hb=d3452fc59b9839846225fd254926c64a9c71f071;hp=69c8c4972a3011baaf95edb894e7208e1037e746;hpb=f40f5b235b890f46770a22f005f8a0f664cf0562;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/leila/production.nix b/modules/private/websites/leila/production.nix
index 69c8c49..b48da6f 100644
--- a/modules/private/websites/leila/production.nix
+++ b/modules/private/websites/leila/production.nix
@@ -2,31 +2,35 @@
let
cfg = config.myServices.websites.leila.production;
varDir = "/var/lib/ftp/leila";
+ apacheUser = config.services.httpd.Prod.user;
+ apacheGroup = config.services.httpd.Prod.group;
in {
- options.myServices.websites.leila.production.enable = lib.mkEnableOption "enable Leila's website in production";
+ options.myServices.websites.leila.production.enable = lib.mkEnableOption "enable Leila's websites in production";
config = lib.mkIf cfg.enable {
- services.phpfpm.poolConfigs.leila = ''
- listen = /run/phpfpm/leila.sock
- user = wwwrun
- group = wwwrun
- listen.owner = wwwrun
- listen.group = wwwrun
+ services.phpfpm.pools.leila = {
+ 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}:/tmp"
- '';
+ "php_admin_value[open_basedir]" = "${varDir}:/tmp";
+ };
+ };
services.webstats.sites = [
{ name = "leila.bouya.org"; }
{ name = "chorale.leila.bouya.org"; }
+ { name = "syrwennecreation.bouya.org"; }
];
- services.websites.production.modules = [ "proxy_fcgi" ];
- services.websites.production.vhostConfs.leila_chorale = {
+ services.websites.env.production.modules = [ "proxy_fcgi" ];
+ services.websites.env.production.vhostConfs.leila_chorale = {
certName = "leila";
addToCerts = true;
hosts = [ "chorale.leila.bouya.org" "chorale-vocanta.fr.nf" "www.chorale-vocanta.fr.nf" ];
@@ -43,13 +47,33 @@ in {
Require ldap-group cn=chorale.leila.bouya.org,cn=httpd,ou=services,dc=immae,dc=eu
- SetHandler "proxy:unix:/run/phpfpm/leila.sock|fcgi://localhost"
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.leila.socket}|fcgi://localhost"
+
+
+ ''
+ ];
+ };
+ services.websites.env.production.vhostConfs.leila_syrwenne = {
+ certName = "leila";
+ addToCerts = true;
+ hosts = [ "syrwennecreation.bouya.org" ];
+ root = "${varDir}/Syrwennecreation";
+ extraConfig = [
+ ''
+ Use Stats syrwennecreation.bouya.org
+
+ DirectoryIndex index.php index.htm index.html
+ Options Indexes FollowSymLinks MultiViews Includes
+ AllowOverride None
+
+
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.leila.socket}|fcgi://localhost"
''
];
};
- services.websites.production.vhostConfs.leila = {
+ services.websites.env.production.vhostConfs.leila = {
certName = "leila";
certMainHost = "leila.bouya.org";
hosts = [ "leila.bouya.org" ];
@@ -66,7 +90,7 @@ in {
Require ldap-group cn=chorale.leila.bouya.org,cn=httpd,ou=services,dc=immae,dc=eu
- SetHandler "proxy:unix:/run/phpfpm/leila.sock|fcgi://localhost"
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.leila.socket}|fcgi://localhost"