.

diff --git a/.docker/config/php/fpm.conf b/.docker/config/php/fpm.conf
index 15bc097b9c0dc4a20d6913fae9f969729f3ece5e..d996fa588bf4a24459259a210f82d68329a14e71 100644 (file)
--- 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 850ae1140699f4f8b9bda202aa1f769cb3e76d56..cba4b872a2e64d6303ff0a63667c1c7363bdd202 100644 (file)
--- 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 a9a7d7e70ea80e6ae5abe49b294eabaf159de679..f3507275eaebc3018db1d3ed548b79f182456f40 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-233.13135.103">
+  <component name="dataSourceStorageLocal" created-in="IU-233.14015.106">
     <data-source name="LFY(3).db" uuid="e5a3291d-855f-44b2-be41-76fe6b0c2136">
       <database-info product="SQLite" version="3.25.1" jdbc-version="2.1" driver-name="SQLite JDBC" driver-version="3.25.1" dbms="SQLITE" exact-version="3.25.1" exact-driver-version="3.25">
         <identifier-quote-string>&quot;</identifier-quote-string>

diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml
index 6fbfbcde36407ff73eea14f9de848e9d17ab5ae0..d4140e690a3d79ce49fbc66e24395960db7f7417 100644 (file)
--- a/.idea/sshConfigs.xml
+++ b/.idea/sshConfigs.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="SshConfigs">
     <configs>
-      <sshConfig authType="PASSWORD" host="192.168.13.6" id="41cc0622-6eee-44fa-b4be-3776d5fa4005" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
+      <sshConfig authType="PASSWORD" host="192.168.13.64" id="41cc0622-6eee-44fa-b4be-3776d5fa4005" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
     </configs>
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index dc011750bbbf627e1acfa125c9b2a01e428a3dcf..a34a8ef299d133be2959945e9ed8ad4eee9f855e 100644 (file)
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -3,7 +3,7 @@
   <component name="WebServers">
     <option name="servers">
       <webServer id="1bea9554-c4f3-46ca-863d-e24e0b12fe19" name="home.tortuga.enhydra.fr" url="https://salon.home.tortuga.enhydra.fr/">
-        <fileTransfer rootFolder="/docker/tortugahome/src" accessType="SFTP" host="192.168.13.6" port="22" sshConfigId="41cc0622-6eee-44fa-b4be-3776d5fa4005" sshConfig="root@192.168.13.6:22 password">
+        <fileTransfer rootFolder="/docker/tortugahome/src" accessType="SFTP" host="192.168.13.64" port="22" sshConfigId="41cc0622-6eee-44fa-b4be-3776d5fa4005" sshConfig="root@192.168.13.64:22 password">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
           </advancedOptions>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 619ca1b8d2a94b7b8a28765f87d482da186e18de..fd4f78e184dd8e518207e8af6998198a8678f5f5 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/.docker/config/monit/conf.d/config" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/config/monit/conf.d/config" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -1293,7 +1292,8 @@
       <workItem from="1703319042563" duration="797000" />
       <workItem from="1704125893623" duration="836000" />
       <workItem from="1704215960754" duration="1064000" />
-      <workItem from="1704879857290" duration="27000" />
+      <workItem from="1704879857290" duration="190000" />
+      <workItem from="1707238767637" duration="48000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1638,7 +1638,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="602" />
+    <option name="localTasksCounter" value="603" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/dnsmasq.conf b/config/dnsmasq.conf
index 57fae9971b8dae8adf900b481a6e90350d71c826..2f90fb0e90ed973ddeacfb4a51eb469d6512cbb0 100644 (file)
--- 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