.

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index c0302d08c3f1c0c4e13a76e602e20cbbe311e74c..8b34b9a5b8fe45eef6b05be6e924f82683cdf69e 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -18,8 +18,8 @@ services:
     ports:
       - '3001:80'
     environment:
-      VIRTUAL_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
-      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
+      VIRTUAL_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
+      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
     networks:
       - tortugahome
       - nginxproxy

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6df3d85cdbe6a7392fbe3ad3125ddec19eee7413..4b4dd247e22725b61b2c646794eea65878ad6145 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change beforePath="$PROJECT_DIR$/.docker/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/docker-compose.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/music.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/music.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/cave.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/install.md" beforeDir="false" afterPath="$PROJECT_DIR$/install.md" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1365,7 +1367,7 @@
       <workItem from="1772370387714" duration="7090000" />
       <workItem from="1773390371781" duration="506000" />
       <workItem from="1774028822942" duration="792000" />
-      <workItem from="1774430967346" duration="3270000" />
+      <workItem from="1774430967346" duration="3394000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1710,7 +1712,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="634" />
+    <option name="localTasksCounter" value="635" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/cave.php b/config/cave.php
deleted file mode 100644 (file)
index 3d14f18..0000000
--- a/config/cave.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-config('ROOM_NAME', 'Cave');
-config('ROOM', 'cave');
-config('SQUEEZEBOX_PLAYER', 'Cave');
-config('SLEEPSCREEN', 30);
-config('SCREENSAVER_BRIGHTNESS', 100);
-config('SLEEPTYPE', 'screensaver');
-config('SCREENSAVER', 'weatherstation');
-config('VIDEOPLAYER', 'mediarasp-small');
-config('TVPLAYER', 'mediarasp-small');
-config('VOLUME', 60);
-config('VOLUME_DEVICE', 'Squeezebox');
-config('VOLUME_STEP', 5);
-config('HIDEMASK_TIMEOUT', 250);
-config('THEME', '#978270');
-
-if (DISPLAYINTERFACE) {
-    $c = cave();
-    $shortcuts['lights'] = $c['all'];
-    $nav = ['home', 'lights', 'music', 'media', 'remote', 'switch', 'settings', 'alert', 'off'];
-
-    include_once ROOT . '/config/music.php';
-
-    $favoriteslights = [
-        ['type' => 'volume', 'volume' => config('VOLUME_STEP') . '%', 'increase' => '+', 'label' => '<i class="fa fa-volume-up"></i>'],
-        ['type' => 'volume', 'volume' => config('VOLUME_STEP') . '%', 'increase' => '-', 'label' => '<i class="fa fa-volume-down"></i>'],
-    ];
-    $favoriteslights[] = array_merge($allmusics['France Info'], array('volume' => 50));
-    $favoriteslights = array_merge($favoriteslights, $c['favorites']);
-    include "media.php";
-    include "default.php";
-}
\ No newline at end of file

diff --git a/config/global.php b/config/global.php
index 993de780c2e5783e0536d4060806e1d264d40c78..6d2f9fa34f0e31062f75e787b6792fd3847b4ff3 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -17,7 +17,6 @@ define('NAS_ROOT', 'smb://192.168.7.31/');
 define('NAS_PWD_ROOT', 'smb://Share:dcfyjbcyckwydtgufjx@192.168.7.31/');
 
 $squeezeboxPlayers = array(
-    'Cave' => 'b8:27:eb:ab:b4:50',
     'Salle de bains' => '8b:42:ec:ef:38:39',
     'Chambre' => 'b8:27:eb:31:e1:44',
     'Cuisine' => '00:04:20:2a:05:2e',
@@ -67,7 +66,6 @@ $devices = [
     'cerveau' => ['id' => 'cerveau', 'host' => '192.168.13.60', 'user' => 'pi', 'password' => 'atacama'],
     'litvincent' => ['id' => 'litvincent', 'host' => '192.168.13.61', 'user' => 'pi', 'password' => 'atacama'],
     'litjerome' => ['id' => 'litjerome', 'host' => '192.168.13.62', 'user' => 'pi', 'password' => 'atacama'],
-    //'cave' => ['id' => 'cave', 'host' => '192.168.13.63', 'user' => 'pi', 'password' => 'atacama'],
     'entree' => ['id' => 'entree', 'host' => '192.168.13.64', 'user' => 'pi', 'password' => 'atacama'],
     'jarvis' => ['id' => 'jarvis', 'host' => '192.168.13.60', 'user' => 'jarvis', 'password' => 'atacama'],
     'chambre' => ['id' => 'chambre', 'host' => '192.168.13.65', 'user' => 'pi', 'password' => 'atacama'],

diff --git a/config/rooms.php b/config/rooms.php
index 42bbe9831344cf901b467556d1f4c1acf3aed208..af7a520aeab821224a2d4aadac0fe448961dc443 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -1,6 +1,6 @@
 <?php
 
-$rooms = array('home' => 'Maison', 'salon' => 'Salon', 'chambre' => 'Chambre', 'bureau' => 'Bureau', 'sdb' => 'Salle de bain', 'cour' => 'Cour', 'wc' => 'WC', 'cuisine' => 'Cuisine', 'cave' => 'Cave');
+$rooms = array('home' => 'Maison', 'salon' => 'Salon', 'chambre' => 'Chambre', 'bureau' => 'Bureau', 'sdb' => 'Salle de bain', 'cour' => 'Cour', 'wc' => 'WC', 'cuisine' => 'Cuisine');
 
 function chambre($additionnalfavorites = array())
 {
@@ -173,17 +173,6 @@ function sdb()
     return array('all' => $all, 'favorites' => $favorites);
 }
 
-function cave()
-{
-    $favorites = [
-
-    ];
-    $all = array_merge($favorites, [
-
-    ]);
-    return array('all' => $all, 'favorites' => $favorites);
-}
-
 function wc()
 {
     $favorites = [

diff --git a/install.md b/install.md
index ce3897389ea59f0031a5d174afaf5db0f4d2d68e..9bab495f18363260a9347a9f73d3548a7a70aba7 100644 (file)
--- a/install.md
+++ b/install.md
@@ -43,7 +43,6 @@ ServerAlias wc.home.tortuga.enhydra.fr
 ServerAlias bureausun.home.tortuga.enhydra.fr
 ServerAlias cour.home.tortuga.enhydra.fr
 ServerAlias balcon.home.tortuga.enhydra.fr
-ServerAlias cave.home.tortuga.enhydra.fr
 
 CustomLog ${APACHE_LOG_DIR}/home-access.log combined
 ErrorLog ${APACHE_LOG_DIR}/home-error.log