X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fnaturaloutil%2Fproduction.nix;h=1e79141d1c5aa0268db1f373e6167ccbdeb5217e;hp=a276c478ef828303e01a09418d91170f6e44f1f5;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hpb=441da8aac378f401625e82caf281fa0e26128310
diff --git a/modules/private/websites/naturaloutil/production.nix b/modules/private/websites/naturaloutil/production.nix
index a276c47..1e79141 100644
--- a/modules/private/websites/naturaloutil/production.nix
+++ b/modules/private/websites/naturaloutil/production.nix
@@ -1,6 +1,6 @@
{ lib, pkgs, config, ... }:
let
- adminer = pkgs.callPackage ../commons/adminer.nix {};
+ adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
cfg = config.myServices.websites.naturaloutil.production;
varDir = "/var/lib/ftp/jerome";
env = config.myEnv.websites.jerome;
@@ -10,7 +10,7 @@ in {
config = lib.mkIf cfg.enable {
services.webstats.sites = [ { name = "naturaloutil.immae.eu"; } ];
- security.acme2.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
+ security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
secrets.keys = [{
dest = "webapps/prod-naturaloutil";
@@ -42,21 +42,22 @@ in {
systemd.services.phpfpm-jerome.after = lib.mkAfter [ "mysql.service" ];
systemd.services.phpfpm-jerome.wants = [ "mysql.service" ];
services.phpfpm.pools.jerome = {
- listen = "/run/phpfpm/naturaloutil.sock";
- extraConfig = ''
- user = wwwrun
- group = wwwrun
- listen.owner = wwwrun
- listen.group = wwwrun
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = {
+ "listen.owner" = "wwwrun";
+ "listen.group" = "wwwrun";
- pm = ondemand
- pm.max_children = 5
- pm.process_idle_timeout = 60
+ "pm" = "ondemand";
+ "pm.max_children" = "5";
+ "pm.process_idle_timeout" = "60";
- env[BDD_CONNECT] = "/var/secrets/webapps/prod-naturaloutil"
- php_admin_value[open_basedir] = "/var/lib/php/sessions/naturaloutil:/var/secrets/webapps/prod-naturaloutil:${varDir}:/tmp"
- php_admin_value[session.save_path] = "/var/lib/php/sessions/naturaloutil"
- '';
+ "php_admin_value[open_basedir]" = "/var/lib/php/sessions/naturaloutil:/var/secrets/webapps/prod-naturaloutil:${varDir}:/tmp";
+ "php_admin_value[session.save_path]" = "/var/lib/php/sessions/naturaloutil";
+ };
+ phpEnv = {
+ BDD_CONNECT = "/var/secrets/webapps/prod-naturaloutil";
+ };
phpOptions = config.services.phpfpm.phpOptions + ''
extension=${pkgs.php}/lib/php/extensions/mysqli.so
'';
@@ -68,7 +69,7 @@ in {
hosts = ["naturaloutil.immae.eu" ];
root = varDir;
extraConfig = [
- adminer.apache.vhostConf
+ (adminer.apache.vhostConf null)
''
Use Stats naturaloutil.immae.eu
ServerAdmin ${env.server_admin}
@@ -76,7 +77,7 @@ in {
CustomLog "${varDir}/logs/access_log" combined
- SetHandler "proxy:unix:/run/phpfpm/naturaloutil.sock|fcgi://localhost"
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.jerome.socket}|fcgi://localhost"