.

diff --git a/.docker/dockerterminal.bat b/.docker/dockerterminal.bat
index f270b74b91d8e4f88dedea15d484bbb554707ea7..420ea09d9665f2af3f8ad4fac935bbf7f09c507b 100644 (file)
--- a/.docker/dockerterminal.bat
+++ b/.docker/dockerterminal.bat
@@ -1,3 +1,3 @@
 @echo off
 cls
-C:\tools\cygwin\bin\ssh.exe -tt root@192.168.13.66 'docker exec -it -u root tortugahome /bin/bash'
+C:\tools\cygwin\bin\ssh.exe -tt root@192.168.13.7 'docker exec -it -u root tortugahome /bin/bash'

diff --git a/.htaccess b/.htaccess
index aa5c6916c772ddbaefc250cda8cc6a8918a2aecc..c82c616f0985fb8c527b7247d053e54a8c26feb9 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-Require ip 192.168.1.0/24 192.168.13.0/24 127.0.0.0/8 88.190.245.49 192.168.17.0/24 172.0.0.0/8
+Require ip 192.168.1.0/24 192.168.13.0/24 127.0.0.0/8 88.190.245.49 192.168.0.0/16 172.0.0.0/8
 <IfModule mod_rewrite.c>
         Options +FollowSymlinks
         RewriteEngine on

diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml
index 1c0230e9793a360c85753c7892acfb8d606a4b0e..a86e32898ea31068fee30805894cd07ad0913a32 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.66" id="41cc0622-6eee-44fa-b4be-3776d5fa4005" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
+      <sshConfig authType="PASSWORD" host="192.168.13.7" 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 cd8e106d461ebc855103b708202247299eb6d417..38aaef231d97fd73f33dfbf7bf3f2974c854078b 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.66" port="22" sshConfigId="41cc0622-6eee-44fa-b4be-3776d5fa4005" sshConfig="root@192.168.13.66:22 password">
+        <fileTransfer rootFolder="/docker/tortugahome/src" accessType="SFTP" host="192.168.13.7" port="22" sshConfigId="41cc0622-6eee-44fa-b4be-3776d5fa4005" sshConfig="root@192.168.13.7:22 password">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
           </advancedOptions>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2534e7805a006ded1866bdeebd4f12727ebaf9b5..70e9aafae26e51c96b392be0ee53c557d487d58e 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change beforePath="$PROJECT_DIR$/.docker/dockerterminal.bat" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dockerterminal.bat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.htaccess" beforeDir="false" afterPath="$PROJECT_DIR$/.htaccess" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sshConfigs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sshConfigs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/ical.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ical.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/redis.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/redis.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/switchbot.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/switchbot.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/dnsmasq.conf" beforeDir="false" afterPath="$PROJECT_DIR$/config/dnsmasq.conf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/profile.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/profile.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1167,14 +1170,7 @@
       <workItem from="1665655356996" duration="39000" />
       <workItem from="1665922708761" duration="719000" />
       <workItem from="1666248330245" duration="464000" />
-      <workItem from="1666784917537" duration="1072000" />
-    </task>
-    <task id="LOCAL-00486" summary=".">
-      <created>1621494387501</created>
-      <option name="number" value="00486" />
-      <option name="presentableId" value="LOCAL-00486" />
-      <option name="project" value="LOCAL" />
-      <updated>1621494387501</updated>
+      <workItem from="1666784917537" duration="4599000" />
     </task>
     <task id="LOCAL-00487" summary=".">
       <created>1621847082796</created>
@@ -1512,7 +1508,14 @@
       <option name="project" value="LOCAL" />
       <updated>1666248746111</updated>
     </task>
-    <option name="localTasksCounter" value="535" />
+    <task id="LOCAL-00535" summary=".">
+      <created>1666794867110</created>
+      <option name="number" value="00535" />
+      <option name="presentableId" value="LOCAL-00535" />
+      <option name="project" value="LOCAL" />
+      <updated>1666794867110</updated>
+    </task>
+    <option name="localTasksCounter" value="536" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/dnsmasq.conf b/config/dnsmasq.conf
index b89e246d8c912ef5648b5dfffa03c2140d292677..84440ca2f9ae8107f54a1e20eda0d7aceb25d963 100644 (file)
--- a/config/dnsmasq.conf
+++ b/config/dnsmasq.conf
@@ -5,7 +5,7 @@ server=151.80.222.79
 server=192.168.13.1
 server=8.8.8.8
 address=/nas.home.tortuga.enhydra.fr/192.168.13.1
-address=/home.tortuga.enhydra.fr/192.168.13.66
+address=/home.tortuga.enhydra.fr/192.168.13.7
 address=/kodidb.home.tortuga.enhydra.fr/192.168.13.66
 address=/squeezebox.home.tortuga.enhydra.fr/192.168.13.67
 address=/mafreebox.freebox.fr/192.168.13.1

diff --git a/scripts/lib/profile.php b/scripts/lib/profile.php
index cc6cf536590759f70939797ce53432fbe38748da..6596a54105b4d67e88322c2695d49d8f8544682d 100644 (file)
--- a/scripts/lib/profile.php
+++ b/scripts/lib/profile.php
@@ -4,24 +4,24 @@ use Illuminate\Support\Str;
 
 require_once ROOT . '/vendor/autoload.php';
 
-$u = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
-
-$n = isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : '-';
-$n = str_replace('.php', '', $n);
-$n = str_replace('/home/tortugahome/www/', '', $n);
-$n = str_replace('/application/', '', $n);
-$n = str_replace('/', '-', $n);
-$n = trim($n, '/ ');
-
-$profileFp = fopen('/var/log/tortugahome/profiles/' . Str::slug($n) . '.log', 'a+b');
-$profileStart = microtime(true);
-fwrite($profileFp, "\r\n\r\n------------\r\n" . 'URL : ' . $u . "\r\nDate : " . date('Y-m-d H:i:s') . "\r\n" . print_r($_REQUEST, true) . "\r\n\r\n");
+//$u = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
+//
+//$n = isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : '-';
+//$n = str_replace('.php', '', $n);
+//$n = str_replace('/home/tortugahome/www/', '', $n);
+//$n = str_replace('/application/', '', $n);
+//$n = str_replace('/', '-', $n);
+//$n = trim($n, '/ ');
+//
+//$profileFp = fopen('/var/log/tortugahome/profiles/' . Str::slug($n) . '.log', 'a+b');
+//$profileStart = microtime(true);
+//fwrite($profileFp, "\r\n\r\n------------\r\n" . 'URL : ' . $u . "\r\nDate : " . date('Y-m-d H:i:s') . "\r\n" . print_r($_REQUEST, true) . "\r\n\r\n");
 
 function profile($desc, $file = 'unset', $line = 'unset')
 {
-    global $profileStart, $profileFp;
-    if (is_resource($profileFp)) {
-        $ms = round((microtime(true) - $profileStart) * 1000) . 'ms';
-        fwrite($profileFp, $ms . ';' . $desc . ';' . $file . ';' . $line . "\r\n");
-    }
+//    global $profileStart, $profileFp;
+//    if (is_resource($profileFp)) {
+//        $ms = round((microtime(true) - $profileStart) * 1000) . 'ms';
+//        fwrite($profileFp, $ms . ';' . $desc . ';' . $file . ';' . $line . "\r\n");
+//    }
 }
\ No newline at end of file