.

diff --git a/.docker/dockerterminal.bat b/.docker/dockerterminal.bat
index 11ec46822a6172950d99dd69facea1331cffc77f..e9e6b32e499163847f9171677ee0d3346812ef2c 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@home.tortuga.enhydra.fr 'docker exec -it -u root tortugahome /bin/bash'
+C:\tools\cygwin\bin\ssh.exe -tt root@192.168.13.64 'docker exec -it -u root tortugahome /bin/bash'

diff --git a/.docker/update b/.docker/update
index 285739ac31af1f44c4b477aff047588e7adce1c9..cc63bcaf207d188cd8cd70db6608dfee4b0f9e5a 100644 (file)
--- a/.docker/update
+++ b/.docker/update
@@ -7,6 +7,7 @@ chmod 755 ./src/tools/xplanet/xplanet*
 chmod 755 ./src/.docker/phpdocker/php-fpm/startup
 chmod -R 755 ./src/bin
 chmod -R 755 ./src/servers
+chmod -R 777 ./src/cache
 rm -f monit/conf.d/*.save
 docker network create --driver bridge tortugahome
 docker compose build --pull

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9a5acf145a3a7aa27ad933f441dfeae984caa0c0..67ea1134e21dd6b81f9d455d568544c9c6b71d5b 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,13 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <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 afterPath="$PROJECT_DIR$/scripts/xplanet.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/dockerterminal.bat" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dockerterminal.bat" 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" />
+      <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/heartbeats.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/heartbeats.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -239,37 +238,39 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;Shell Script.Docker terminal.executor&quot;: &quot;Run&quot;,
-    &quot;Shell Script.Update DNS.executor&quot;: &quot;Run&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
-    &quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Works/tortuga-home&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "Shell Script.Docker terminal.executor": "Run",
+    "Shell Script.Update DNS.executor": "Run",
+    "WebServerToolWindowFactoryState": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
+    "WebServerToolWindowPanel.toolwindow.show.date": "false",
+    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
+    "WebServerToolWindowPanel.toolwindow.show.size": "false",
+    "deletionFromPopupRequiresConfirmation": "false",
+    "git-widget-placeholder": "master",
+    "ignore.virus.scanning.warn.message": "true",
+    "junie.onboarding.icon.badge.shown": "true",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "D:/Works/tortuga-home",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.2",
+    "ruby.rails.projectView.checked": "true",
+    "settings.editor.selected.configurable": "preferences.pluginManager",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Works\tortuga-home\scripts" />
@@ -1346,7 +1347,9 @@
       <workItem from="1738270012862" duration="7140000" />
       <workItem from="1738696117392" duration="3424000" />
       <workItem from="1743155457881" duration="635000" />
-      <workItem from="1747769206421" duration="3028000" />
+      <workItem from="1747769206421" duration="5548000" />
+      <workItem from="1748247197909" duration="4084000" />
+      <workItem from="1749022280289" duration="2180000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1691,7 +1694,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="626" />
+    <option name="localTasksCounter" value="627" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1732,6 +1735,17 @@
     <MESSAGE value="." />
     <option name="LAST_COMMIT_MESSAGE" value="." />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="php">
+          <url>file://$PROJECT_DIR$/scripts/cron/cron.php</url>
+          <line>257</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
     <select />

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index f39138c2265f6fe0db482bc4e5c5d28b2fa5f272..337c3c99a100ecf9fdf8605c872767df4ed1fd52 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -57,11 +57,7 @@ function cronHotWater($cronmin) {
 
 function cronXPlanet($cronmin) {
        _logSection('XPlanet');
-       $path = ROOT . '/tools/xplanet/';
-       $suncurve = $path . 'xplanet-suncurve';
-       $earth = $path . 'xplanet-earth';
-
-       `$suncurve;$earth`;
+       file_get_contents('https://entree.home.tortuga.enhydra.fr/scripts/xplanet.php');
 }
 
 

diff --git a/scripts/lib/heartbeats.php b/scripts/lib/heartbeats.php
index df3c38b2056940f805a802f46f3738ada44ed6e8..1f93d9359091c5cf2ec3d303d793b104ffb6236c 100644 (file)
--- a/scripts/lib/heartbeats.php
+++ b/scripts/lib/heartbeats.php
@@ -41,7 +41,7 @@ function restartDeadDevices()
         'chambre' => ['room' => 'chambre', 'type' => 'rpi', 'eco' => false],
         'bureausun' => ['room' => 'bureau', 'type' => 'rpi', 'eco' => false],
         'entree' => ['room' => 'entree', 'type' => 'rpi-no-reboot', 'eco' => false],
-        'cuisine' => ['room' => 'cuisine', 'type' => 'android', 'eco' => true],
+        //'cuisine' => ['room' => 'cuisine', 'type' => 'android', 'eco' => true],
         'salon' => ['room' => 'salon', 'type' => 'android', 'eco' => true],
         'sdb' => ['room' => 'sdb', 'type' => 'android', 'eco' => true],
     ];

diff --git a/scripts/xplanet.php b/scripts/xplanet.php
new file mode 100644 (file)
index 0000000..0c958e0
--- /dev/null
+++ b/scripts/xplanet.php
@@ -0,0 +1,9 @@
+<?php
+require_once "./import.php";
+$path = ROOT . '/tools/xplanet/';
+$suncurve = $path . 'xplanet-suncurve';
+$earth = $path . 'xplanet-earth';
+
+echo '<pre>' . `$suncurve 2>&1;$earth 2>&1` . '</pre>';
+echo '<img src="/images/earth.png" />';
+echo '<img src="/images/suncurve.png" />';
\ No newline at end of file