.

diff --git a/.htaccess b/.htaccess
index 7209fe2aad26c6e3544dfa1a75b49d5c617f5c3e..d8466964c85a34c69b79b44c9d112c4a8db27edd 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -32,7 +32,7 @@ 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
         RewriteCond %{REQUEST_FILENAME} -d
         RewriteRule ^.*$ - [NC,L]
 
-        sRewriteRule ^apk(.*)$ app/build/outputs/apk/debug/app-debug.apk [F]
+        RewriteRule ^apk(.*)$ app/build/outputs/apk/debug/app-debug.apk [F]
 
          RewriteRule ^s$ https://salon.home.tortuga.enhydra.fr/ [L,R=301]
          RewriteRule ^b$ https://bureau.home.tortuga.enhydra.fr/ [L,R=301]

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 7f0eabe03b500320237fcaafc26ecb6cdd8ae595..7f84bf756d0d376c4d7d14a8168222809ddd4c2a 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -2,11 +2,28 @@
 <project version="4">
   <component name="PublishConfigData" autoUpload="On explicit save action" serverName="home.tortuga.enhydra.fr" autoUploadExternalChanges="true" showAutoUploadSettingsWarning="false">
     <serverData>
+      <paths name="dev-redbr.enhydra.fr">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="home.tortuga.enhydra.fr">
         <serverdata>
           <mappings>
             <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
           </mappings>
+          <excludedPaths>
+            <excludedPath local="true" path="vendor" />
+          </excludedPaths>
+        </serverdata>
+      </paths>
+      <paths name="home2">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
         </serverdata>
       </paths>
     </serverData>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 68662221401e254b86289caca67ebc947bdd9ef0..364a4178f84e4618311dfe6504e49b9946736955 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change beforePath="$PROJECT_DIR$/.htaccess" beforeDir="false" afterPath="$PROJECT_DIR$/.htaccess" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/harmony.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/harmony.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/kodi.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/kodi.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/domoticz.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/ssh.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ssh.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/startdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/servers/startdaemon" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/startserver" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/stopserver" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -281,6 +286,17 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="ArquillianTestNG" factoryName="">
       <option name="arquillianRunConfiguration">
         <value>
@@ -1014,14 +1030,9 @@
       <workItem from="1622115664953" duration="1262000" />
       <workItem from="1622179648274" duration="2594000" />
       <workItem from="1622185202332" duration="1711000" />
-      <workItem from="1622440150420" duration="724000" />
-    </task>
-    <task id="LOCAL-00439" summary=".">
-      <created>1611655053435</created>
-      <option name="number" value="00439" />
-      <option name="presentableId" value="LOCAL-00439" />
-      <option name="project" value="LOCAL" />
-      <updated>1611655053436</updated>
+      <workItem from="1622440150420" duration="1374000" />
+      <workItem from="1622659686189" duration="138000" />
+      <workItem from="1622659989891" duration="3179000" />
     </task>
     <task id="LOCAL-00440" summary=".">
       <created>1611655420798</created>
@@ -1359,7 +1370,14 @@
       <option name="project" value="LOCAL" />
       <updated>1621847082796</updated>
     </task>
-    <option name="localTasksCounter" value="488" />
+    <task id="LOCAL-00488" summary=".">
+      <created>1622441173733</created>
+      <option name="number" value="00488" />
+      <option name="presentableId" value="LOCAL-00488" />
+      <option name="project" value="LOCAL" />
+      <updated>1622441173734</updated>
+    </task>
+    <option name="localTasksCounter" value="489" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/tv.php b/config/tv.php
index d80c4574cbd128a15080bdeb4826a05525e7ec1e..e3b7842c8023a7a2e99eb70dca43e5fb487e025b 100644 (file)
--- a/config/tv.php
+++ b/config/tv.php
@@ -2,7 +2,7 @@
 $mapdvb = connectRedis()->igbget('dvbchannels');
 if (!$mapdvb) {
     $mapdvb = array();
-    $m3u = getUrlContent('http://192.168.13.60:9981/playlist/channels', 30);
+    $m3u = getUrlContent('http://tvheadend.home.tortuga.enhydra.fr:9981/playlist/channels', 30);
     $lines = explode("\n", $m3u);
     $name = '';
     foreach ($lines as $line) {

diff --git a/scripts/lib/domoticz.php b/scripts/lib/domoticz.php
index ea9c6ef5d414e7cab39e3ac23628bb817226f0c2..f8548ca2f5a0ba8c97a7406869eab0c926be0c33 100644 (file)
--- a/scripts/lib/domoticz.php
+++ b/scripts/lib/domoticz.php
@@ -6,7 +6,7 @@ function runDomoticzCommand($params)
 
     unset($params['delay']);
 
-    $ip = '192.168.13.60';
+    $ip = 'domoticz.home.tortuga.enhydra.fr';
     return httpRequest('http://' . $ip . ':8084/json.htm', 'GET', $params);
 }
 

diff --git a/scripts/lib/ssh.php b/scripts/lib/ssh.php
index 429dfd92fed5d755a30450beac3423897743f069..acbfb0a151b623c80fe48d149f99541242d62030 100644 (file)
--- a/scripts/lib/ssh.php
+++ b/scripts/lib/ssh.php
@@ -40,14 +40,15 @@ function getSSHInstance($device = null, $sudo = false, $force = false)
 function sshCommand($command, $device = null, $blocking = true, $sudo = false)
 {
     return sshRunCommand($command, $device, $blocking, $sudo);
-    $redis = connectRedis();
-    $queue = $redis->igbget('ssh_queue');
-    if (!is_array($queue)) {
-        $queue = [];
-    }
-    $queue[] = ['command' => $command, 'device' => $device, 'blocking' => $blocking, 'sudo' => $sudo];
-    $redis->igbset('ssh_queue', $queue);
-    $redis->publish('ssh_event', 'handle_queue');
+//    $redis = connectRedis();
+//    $queue = $redis->igbget('ssh_queue');
+//    if (!is_array($queue)) {
+//        $queue = [];
+//    }
+//    $queue[] = ['command' => $command, 'device' => $device, 'blocking' => $blocking, 'sudo' => $sudo];
+//    $redis->igbset('ssh_queue', $queue);
+//    $redis->publish('ssh_event', 'handle_queue');
+//
 }
 
 function sshRunCommand($command, $device = null, $blocking = true, $sudo = false)
@@ -78,4 +79,4 @@ function sshRunCommand($command, $device = null, $blocking = true, $sudo = false
         $res = array('cmd' => $command, 'device' => $device, 'error' => 'no device');
     }
     return $res;
-}
+}
\ No newline at end of file

diff --git a/servers/startdaemon b/servers/startdaemon
index 3b74ad6c695350075a8ef4c9766ec38a6f260d53..26d318bd4301008d3a8fafd09d904da84621b9da 100644 (file)
--- a/servers/startdaemon
+++ b/servers/startdaemon
@@ -1,2 +1,2 @@
 #!/bin/sh
-/sbin/start-stop-daemon --start --quiet --user pi --chuid pi --name home-$1 --make-pidfile --pidfile /var/run/home-$1.pid  --background --startas /bin/bash -- -c "exec /var/www/home/servers/_startdaemon.php $1"
\ No newline at end of file
+/sbin/start-stop-daemon --start --quiet --user tortugahome --chuid tortugahome --name home-$1 --make-pidfile --pidfile /var/run/home-$1.pid  --background --startas /bin/bash -- -c "exec /var/www/home/servers/_startdaemon.php $1"
\ No newline at end of file

diff --git a/servers/startserver b/servers/startserver
deleted file mode 100644 (file)
index ac9a70e..0000000
--- a/servers/startserver
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /var/www/home
-php -S 192.168.13.60:$2 "/var/www/home" >> "/var/log/home/$1.log"
\ No newline at end of file

diff --git a/servers/stopserver b/servers/stopserver
deleted file mode 100644 (file)
index 75a10d2..0000000
--- a/servers/stopserver
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/php
-<?php
-$port = $argv[2];
-`kill $(ps aux | grep '[p]hp -S 192.168.13.60:$port' | awk '{print $2}')`;
\ No newline at end of file