X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fteliotortay%2Fproduction.nix;h=62762ec7606c1002251668064a550a18d4f4e9b5;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=b0544eec62a54e9b2ee0b34725a2b160b2363543;hpb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/teliotortay/production.nix b/modules/private/websites/teliotortay/production.nix
index b0544ee..62762ec 100644
--- a/modules/private/websites/teliotortay/production.nix
+++ b/modules/private/websites/teliotortay/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.telioTortay.production;
varDir = "/var/lib/ftp/telio_tortay";
env = config.myEnv.websites.telioTortay;
@@ -22,20 +22,19 @@ in {
systemd.services.phpfpm-telio-tortay.after = lib.mkAfter [ "mysql.service" ];
systemd.services.phpfpm-telio-tortay.wants = [ "mysql.service" ];
services.phpfpm.pools.telio-tortay = {
- listen = "/run/phpfpm/telio-tortay.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";
- php_admin_value[open_basedir] = "/var/lib/php/sessions/telio-tortay:${varDir}:/tmp"
- php_admin_value[session.save_path] = "/var/lib/php/sessions/telio-tortay"
- '';
+ "php_admin_value[open_basedir]" = "/var/lib/php/sessions/telio-tortay:${varDir}:/tmp";
+ "php_admin_value[session.save_path]" = "/var/lib/php/sessions/telio-tortay";
+ };
phpOptions = config.services.phpfpm.phpOptions + ''
disable_functions = "mail"
extension=${pkgs.php}/lib/php/extensions/mysqli.so
@@ -45,10 +44,10 @@ in {
services.websites.env.production.vhostConfs.telio-tortay = {
certName = "telio-tortay";
certMainHost = "telio-tortay.immae.eu";
- hosts = ["telio-tortay.immae.eu" "os-tv.fr" ];
+ hosts = ["telio-tortay.immae.eu" "realistesmedia.fr" "www.realistesmedia.fr" ];
root = varDir;
extraConfig = [
- adminer.apache.vhostConf
+ (adminer.apache.vhostConf null)
''
Use Stats telio-tortay.immae.eu
ServerAdmin ${env.server_admin}
@@ -56,7 +55,7 @@ in {
CustomLog "${varDir}/logs/access_log" combined
- SetHandler "proxy:unix:/run/phpfpm/telio-tortay.sock|fcgi://localhost"
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.telio-tortay.socket}|fcgi://localhost"