.

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 2222e477db5b6116fabf6459976b4a34713fc5fc..b656d5d65f1450c6c0f6abbec13965090774ea90 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -1,82 +1,90 @@
 version: '3.1'
 services:
-    redis:
-        container_name: tortugahome-redis
-        image: 'redis:alpine'
-        networks:
-            - tortugahome
-        volumes:
-            - './redis/data/:/data/'
-        restart: unless-stopped
+  redis:
+    container_name: tortugahome-redis
+    image: 'redis:alpine'
+    networks:
+      - tortugahome
+    volumes:
+      - './redis/data/:/data/'
+    restart: unless-stopped
 
-    webserver:
-        container_name: tortugahome-httpd
-        image: 'httpd:alpine'
-        working_dir: /application
-        volumes:
-            - './src/:/usr/local/apache2/htdocs/'
-            - './src/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
-        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
-        networks:
-            - tortugahome
-        restart: unless-stopped
+  webserver:
+    container_name: tortugahome-httpd
+    image: 'httpd:alpine'
+    working_dir: /application
+    volumes:
+      - './src/:/usr/local/apache2/htdocs/'
+      - './src/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
+    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
+    networks:
+      - tortugahome
+    restart: unless-stopped
 
-    php-fpm:
-        container_name: tortugahome
-        build: src/.docker/phpdocker/php-fpm
-        working_dir: /application
-        environment:
-            ADB_HOST: host.docker.internal
-        ports:
-            - '2813:2812'
-            - '5037:5037'
-        volumes:
-            - '/etc/timezone:/etc/timezone:ro'
-            - '/etc/localtime:/etc/localtime:ro'
-            - '/etc/ssl/certs:/etc/ssl/certs:ro'
-            - './src:/application'
-            - './phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini'
-            - './src/:/home/tortugahome/www/'
-            - './src/bin/:/usr/local/bin/'
-#           - './sessions:/var/lib/php/sessions'
-            - 'share:/nas/'
-            - 'share:/volume1/Share/'
-            - 'share:/Share/'
-            - './log:/var/log/tortugahome'
-            - './src/.docker/config/at.allow:/etc/at.allow:ro'
-            - './src/.docker/config/at.deny:/etc/at.deny:ro'
-            - './src/.docker/android/:/root/.android/'
-            - './src/.docker/config/monit/conf.d/:/etc/monit/conf.d/'
-            - './src/.docker/config/monit/id:/var/lib/monit/id'
-            - '/dev/bus/usb:/dev/bus/usb'
-            - './src/.docker/config/php/php.ini:/etc/php/7.4/fpm/conf.d/00-php-override.ini'
-            - './src/.docker/config/php/fpm.conf:/etc/php/7.4/fpm/pool.d/zz-overrides.conf'
-        tmpfs:
-            - /tmp
-        networks:
-            - tortugahome
-        extra_hosts:
-            - "host.docker.internal:host-gateway"
-        restart: unless-stopped
-        privileged: true
-        healthcheck:
-          test: ["CMD", "/application/bin/healthcheck"]
-          interval: 1m
-          timeout: 60s
-          retries: 1
+  php-fpm:
+    container_name: tortugahome
+    build: src/.docker/phpdocker/php-fpm
+    working_dir: /application
+    environment:
+      ADB_HOST: host.docker.internal
+    ports:
+      - '2813:2812'
+      - '5037:5037'
+    volumes:
+      - '/etc/timezone:/etc/timezone:ro'
+      - '/etc/localtime:/etc/localtime:ro'
+      - '/etc/ssl/certs:/etc/ssl/certs:ro'
+      - './src:/application'
+      - './phpdocker/php-fpm/php-ini-overrides.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini'
+      - './src/:/home/tortugahome/www/'
+      - './src/bin/:/usr/local/bin/'
+      #           - './sessions:/var/lib/php/sessions'
+      - 'share:/nas/'
+      - 'share:/volume1/Share/'
+      - 'share:/Share/'
+      - 'videos:/nas/Videos/'
+      - 'videos:/volume1/Share/Videos/'
+      - 'videos:/Share/Videos/'
+      - './log:/var/log/tortugahome'
+      - './src/.docker/config/at.allow:/etc/at.allow:ro'
+      - './src/.docker/config/at.deny:/etc/at.deny:ro'
+      - './src/.docker/android/:/root/.android/'
+      - './src/.docker/config/monit/conf.d/:/etc/monit/conf.d/'
+      - './src/.docker/config/monit/id:/var/lib/monit/id'
+      - '/dev/bus/usb:/dev/bus/usb'
+      - './src/.docker/config/php/php.ini:/etc/php/7.4/fpm/conf.d/00-php-override.ini'
+      - './src/.docker/config/php/fpm.conf:/etc/php/7.4/fpm/pool.d/zz-overrides.conf'
+    tmpfs:
+      - /tmp
+    networks:
+      - tortugahome
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    restart: unless-stopped
+    privileged: true
+    healthcheck:
+      test: [ "CMD", "/application/bin/healthcheck" ]
+      interval: 1m
+      timeout: 60s
+      retries: 1
 
 networks:
-    tortugahome:
-        external:
-            name: tortugahome
+  tortugahome:
+    external:
+      name: tortugahome
 
 volumes:
   share:
     driver_opts:
       type: cifs
-      o: "username=Share,password=RQpZHMDLtbc229FQV3,rw,file_mode=0777,dir_mode=0777"
-      device: "//192.168.13.1/1.42.6-25556"
+      o: "username=Share,password=dcfyjbcyckwydtgufjx,rw,file_mode=0777,dir_mode=0777"
+      device: "//192.168.7.31/Share"
+  videos:
+    driver_opts:
+      type: cifs
+      o: "username=Share,password=dcfyjbcyckwydtgufjx,rw,file_mode=0777,dir_mode=0777"
+      device: "//192.168.7.31/Media/Videos"

diff --git a/.docker/update b/.docker/update
index dfd91598b4641d20f32462c18d5dbf85b45a2080..6fc48068ac7640a922870b93f663da247f16ab8e 100644 (file)
--- a/.docker/update
+++ b/.docker/update
@@ -4,8 +4,8 @@ chmod -R 777 ./log
 chmod 755 ./src/tools/xplanet/xplanet*
 rm -f monit/conf.d/*.save
 docker network create --driver bridge tortugahome
-docker-compose build --pull
-docker-compose pull
-docker-compose down
-docker-compose up -d
+docker compose build --pull
+docker compose pull
+docker compose down -v
+docker compose up -d
 docker restart nginx-proxy

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 7f9ba08a7935fd6e7095cf8784b8dedbc394db6d..a7db01c4b3a00d30461c3f6c5ebb5995fa643668 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-241.15989.150">
+  <component name="dataSourceStorageLocal" created-in="IU-241.17890.1">
     <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 0b499dddfdc85cf46009f4bdd2951e78d8ebac01..182d281db3a86a1d032e4421e7086276b4104e2c 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$/.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$/config/dnsmasq.conf" beforeDir="false" afterPath="$PROJECT_DIR$/config/dnsmasq.conf" 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$/bin/restarthome" beforeDir="false" afterPath="$PROJECT_DIR$/bin/restarthome" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -417,8 +419,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.15989.150" />
-        <option value="bundled-js-predefined-1d06a55b98c1-91d5c284f522-JavaScript-IU-241.15989.150" />
+        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17890.1" />
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17890.1" />
       </set>
     </attachedChunks>
   </component>
@@ -1320,7 +1322,9 @@
       <workItem from="1713531985684" duration="2444000" />
       <workItem from="1713941353441" duration="3152000" />
       <workItem from="1715586628163" duration="670000" />
-      <workItem from="1716389152246" duration="456000" />
+      <workItem from="1716389152246" duration="475000" />
+      <workItem from="1718608940684" duration="1876000" />
+      <workItem from="1718867770014" duration="2012000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1665,7 +1669,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="616" />
+    <option name="localTasksCounter" value="617" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/bin/restarthome b/bin/restarthome
index 59161274f8d360534957f9b95556570e25182abc..e445628cf5eafc2a2d7385193668241678510e8f 100644 (file)
--- a/bin/restarthome
+++ b/bin/restarthome
@@ -9,6 +9,7 @@ sleep 3
 /application/servers/stopdaemon squeezebox
 /application/servers/startdaemon squeezebox
 /application/bin/restart-logcat
+chmod -R 777 /tmp/php-tmdb-api
 sleep 5
 /usr/bin/monit
 sleep 1

diff --git a/config/global.php b/config/global.php
index 020c0b624febeb82d8f9ca0b8a2f45ad2fa35515..993de780c2e5783e0536d4060806e1d264d40c78 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -3,7 +3,7 @@ ini_set('display_errors', true);
 
 define('WEB_ROOT', 'https://home.tortuga.enhydra.fr/');
 
-define("SQUEEZEBOX_SERVER", 'http://squeezebox.home.tortuga.enhydra.fr:9000');
+define("SQUEEZEBOX_SERVER", 'http://192.168.13.67:9000');
 define("SQUEEZEBOX_SPOTIFY_USERNAME", '70@enhydra.fr');
 define("SQUEEZEBOX_SPOTIFY_PASSWORD", '?Z8}#HK+SZrQ');
 
@@ -13,8 +13,8 @@ define('HUE_USER', 'zZigF7nPQq9nTZ3GTB1zkntn98trOJVFHWAwFiqQ');
 define('LATITUDE', 48.8758392);
 define('LONGITUDE', 2.3422104);
 
-define('NAS_ROOT', 'smb://192.168.13.1/1.42.6-25556/');
-define('NAS_PWD_ROOT', 'smb://Share:RQpZHMDLtbc229FQV3@192.168.13.1/1.42.6-25556/');
+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',