From 7a7e0318887e9873121825c2894486147ef81ca9 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 6 Feb 2024 18:39:51 +0100 Subject: [PATCH] . --- .docker/config/php/fpm.conf | 38 +++++++++++++++++++++++++++++++++++-- .docker/config/php/php.ini | 5 +++++ .idea/dataSources.local.xml | 2 +- .idea/sshConfigs.xml | 2 +- .idea/webServers.xml | 2 +- .idea/workspace.xml | 6 +++--- config/dnsmasq.conf | 25 ++++++++++++++++++------ 7 files changed, 66 insertions(+), 14 deletions(-) diff --git a/.docker/config/php/fpm.conf b/.docker/config/php/fpm.conf index 15bc097..d996fa5 100644 --- a/.docker/config/php/fpm.conf +++ b/.docker/config/php/fpm.conf @@ -1,3 +1,37 @@ +[global] +; Override default pid file +pid = /run/php-fpm.pid + +; Avoid logs being sent to syslog +error_log = /proc/self/fd/2 + +; Set this to php default's max_execution_time to allow children to stop gracefully when fpm is commanded to stop +; This helps avoiding 502's +process_control_timeout = 90 + +; Do not daemonize (eg send process to the background) +daemonize = no + [www] -pm.max_children = 15 -pm.max_requests = 500 \ No newline at end of file +; Access from webserver container is via network, not socket file +listen = [::]:9000 + +; Redirect logs to stdout - FPM closes /dev/std* on startup +access.log = /proc/self/fd/1 +catch_workers_output = yes + +; Remove "pool www" decoration from log output (older phpdocker.io containers for php use sed for this) +decorate_workers_output = no + +; Required to allow config-by-environment +clear_env = no + +user = 1001 +group = 33 + +pm = dynamic +pm.max_children = 64 +pm.start_servers = 32 +pm.min_spare_servers = 16 +pm.max_spare_servers = 48 +pm.max_requests = 1000 diff --git a/.docker/config/php/php.ini b/.docker/config/php/php.ini index 850ae11..cba4b87 100644 --- a/.docker/config/php/php.ini +++ b/.docker/config/php/php.ini @@ -1,2 +1,7 @@ upload_max_filesize = 100M post_max_size = 108M +error_log = /proc/self/fd/2 +log_errors = 1 +memory_limit = 12G +max_input_vars = 1000000 +max_execution_time = 90 diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index a9a7d7e..f350727 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + " diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml index 6fbfbcd..d4140e6 100644 --- a/.idea/sshConfigs.xml +++ b/.idea/sshConfigs.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/webServers.xml b/.idea/webServers.xml index dc01175..a34a8ef 100644 --- a/.idea/webServers.xml +++ b/.idea/webServers.xml @@ -3,7 +3,7 @@ - diff --git a/config/dnsmasq.conf b/config/dnsmasq.conf index 57fae99..2f90fb0 100644 --- a/config/dnsmasq.conf +++ b/config/dnsmasq.conf @@ -9,12 +9,25 @@ server=1.0.0.1 address=/nas.home.tortuga.enhydra.fr/192.168.13.1 address=/mafreebox.freebox.fr/192.168.13.1 # Home -address=/home.tortuga.enhydra.fr/192.168.13.6 -address=/kodidb.home.tortuga.enhydra.fr/192.168.13.6 -address=/kodi.home.tortuga.enhydra.fr/192.168.13.6 +address=/home.tortuga.enhydra.fr/192.168.13.64 +address=/entree.home.tortuga.enhydra.fr/192.168.13.64 +address=/salon.home.tortuga.enhydra.fr/192.168.13.64 +address=/sdb.home.tortuga.enhydra.fr/192.168.13.64 +address=/bureau.home.tortuga.enhydra.fr/192.168.13.64 +address=/wc.home.tortuga.enhydra.fr/192.168.13.64 +address=/bureausun.home.tortuga.enhydra.fr/192.168.13.64 +address=/litvincent.home.tortuga.enhydra.fr/192.168.13.64 +address=/litjerome.home.tortuga.enhydra.fr/192.168.13.64 +address=/chambre.home.tortuga.enhydra.fr/192.168.13.64 +address=/balcon.home.tortuga.enhydra.fr/192.168.13.64 +address=/cour.home.tortuga.enhydra.fr/192.168.13.64 +address=/bureausun.home.tortuga.enhydra.fr/192.168.13.64 +address=/cave.home.tortuga.enhydra.fr/192.168.13.64 +address=/kodidb.home.tortuga.enhydra.fr/192.168.13.64 +address=/kodi.home.tortuga.enhydra.fr/192.168.13.64 # Mediaserver -address=/squeezebox.home.tortuga.enhydra.fr/192.168.13.7 -address=/plex.home.tortuga.enhydra.fr/192.168.13.7 +address=/squeezebox.home.tortuga.enhydra.fr/192.168.13.67 +address=/plex.home.tortuga.enhydra.fr/192.168.13.66 # Backup address=/dockerbackup.home.tortuga.enhydra.fr/192.168.13.70 # Servarr @@ -29,4 +42,4 @@ address=/paperless.home.tortuga.enhydra.fr/192.168.13.6 address=/piwigo.home.tortuga.enhydra.fr/192.168.13.6 # Nextcloud address=/nextcloud.home.tortuga.enhydra.fr/141.94.68.154 -address=/nextcloud.enhydra.fr/141.94.68.154 \ No newline at end of file +address=/nextcloud.enhydra.fr/141.94.68.154 -- 2.39.5