.

diff --git a/.docker/config/httpd/httpd.conf b/.docker/config/httpd/httpd.conf
index b5e6a9534148e57c67c69c99f51f73594f84f7f9..f31097da84ff0cdf5c96987ce22f85d2d3a708d4 100644 (file)
--- a/.docker/config/httpd/httpd.conf
+++ b/.docker/config/httpd/httpd.conf
@@ -293,11 +293,12 @@ DocumentRoot "/usr/local/apache2/htdocs"
 </Directory>
 
 RemoteIPHeader X-Forwarded-For
-RemoteIPInternalProxy nginx-proxy
+RemoteIPInternalProxy nginxproxy
 
 <Location />
    <RequireAny>
-        Require ip 127.0.0.0/8 192.168.0.0/16 172.0.0.0/8 172.27.13.0/24 130.180.213.67
+        Require ip 127.0.0.0/8 192.168.0.0/16 172.0.0.0/8 172.27.13.0/24
+        Require forward-dns paris.cubedesigners.com cocodrilo.enhydra.fr
    </RequireAny>
 </Location>
 

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 27fef060b1bc3f7a208d731348c11c232fd87ecc..c0302d08c3f1c0c4e13a76e602e20cbbe311e74c 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.1'
 services:
   redis:
     container_name: tortugahome-redis
@@ -23,6 +22,7 @@ services:
       LETSENCRYPT_HOST: home.tortuga.enhydra.fr, entree.home.tortuga.enhydra.fr, cuisine.home.tortuga.enhydra.fr, salon.home.tortuga.enhydra.fr, bureau.home.tortuga.enhydra.fr, chambre.home.tortuga.enhydra.fr, litvincent.home.tortuga.enhydra.fr, litjerome.home.tortuga.enhydra.fr, sdb.home.tortuga.enhydra.fr, wc.home.tortuga.enhydra.fr, bureausun.home.tortuga.enhydra.fr, cour.home.tortuga.enhydra.fr, balcon.home.tortuga.enhydra.fr, cave.home.tortuga.enhydra.fr
     networks:
       - tortugahome
+      - nginxproxy
     restart: unless-stopped
 
   php-fpm:
@@ -75,8 +75,12 @@ services:
 
 networks:
   tortugahome:
-    external:
-      name: tortugahome
+    name: tortugahome
+    external: true
+
+  nginxproxy:
+    name: nginxproxy
+    external: true
 
 #volumes:
 #  share:

diff --git a/.docker/update b/.docker/update
index 6fc48068ac7640a922870b93f663da247f16ab8e..285739ac31af1f44c4b477aff047588e7adce1c9 100644 (file)
--- a/.docker/update
+++ b/.docker/update
@@ -1,11 +1,17 @@
 #!/bin/sh
 cd /docker/tortugahome
+chown -R 1001:33 ./src
 chmod -R 777 ./log
+mkdir -p ./log/tortugahome/profiles
 chmod 755 ./src/tools/xplanet/xplanet*
+chmod 755 ./src/.docker/phpdocker/php-fpm/startup
+chmod -R 755 ./src/bin
+chmod -R 755 ./src/servers
 rm -f monit/conf.d/*.save
 docker network create --driver bridge tortugahome
 docker compose build --pull
 docker compose pull
 docker compose down -v
 docker compose up -d
-docker restart nginx-proxy
+chmod 755 ./src/update
+docker exec tortugahome /application/update
\ No newline at end of file

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 27a78a5871aea808fce4d446b854577d5358a212..cb7d1c1c8bfcf5fe66b68be97ba044dbf20515c6 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-243.26053.27">
+  <component name="dataSourceStorageLocal" created-in="IU-251.25410.129">
     <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/workspace.xml b/.idea/workspace.xml
index 3a13e74dd46b262c91fd23854556818b894b2121..9a5acf145a3a7aa27ad933f441dfeae984caa0c0 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/scripts/lib/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/denon.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/config/httpd/httpd.conf" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/config/httpd/httpd.conf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/docker-compose.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/update" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/adb-connect" beforeDir="false" afterPath="$PROJECT_DIR$/bin/adb-connect" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/restart-logcat" beforeDir="false" afterPath="$PROJECT_DIR$/bin/restart-logcat" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -222,7 +228,7 @@
   &quot;associatedIndex&quot;: 2
 }</component>
   <component name="ProjectId" id="1PFC0igWIhrgYSSHbpcyuWkyTcm" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+  <component name="ProjectLevelVcsManager">
     <OptionsSetting value="false" id="Update" />
     <ConfirmationsSetting value="1" id="Add" />
   </component>
@@ -415,8 +421,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-a94e463ab2e7-intellij.indexing.shared.core-IU-243.26053.27" />
-        <option value="bundled-js-predefined-d6986cc7102b-1632447f56bf-JavaScript-IU-243.26053.27" />
+        <option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.25410.129" />
+        <option value="bundled-js-predefined-d6986cc7102b-6a121458b545-JavaScript-IU-251.25410.129" />
       </set>
     </attachedChunks>
   </component>
@@ -1339,7 +1345,8 @@
       <workItem from="1737017181314" duration="2314000" />
       <workItem from="1738270012862" duration="7140000" />
       <workItem from="1738696117392" duration="3424000" />
-      <workItem from="1743155457881" duration="545000" />
+      <workItem from="1743155457881" duration="635000" />
+      <workItem from="1747769206421" duration="3028000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1684,7 +1691,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="625" />
+    <option name="localTasksCounter" value="626" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/bin/adb-connect b/bin/adb-connect
index cc1da1be7a5ae86d35f83619af3a04b7414b7f50..1f5a0e15b46512cfdad0c937c9904e1521390745 100644 (file)
--- a/bin/adb-connect
+++ b/bin/adb-connect
@@ -1,3 +1,3 @@
 #!/bin/sh
 adb connect 192.168.13.40:5555
-adb connect 192.168.13.41:5555
+#adb connect 192.168.13.41:5555

diff --git a/bin/restart-logcat b/bin/restart-logcat
index c16ce1a13d9b629a304f6855116e3541593b1792..132535d756f4b3208de5150ff511a1efc463a219 100644 (file)
--- a/bin/restart-logcat
+++ b/bin/restart-logcat
@@ -2,6 +2,6 @@
 pkill -f adb
 /application/bin/adb-connect
 /application/servers/stopdaemon logcats
-/application/servers/stopdaemon logcatb
+#/application/servers/stopdaemon logcatb
 /application/servers/startdaemon logcats
-/application/servers/startdaemon logcatb
+#/application/servers/startdaemon logcatb