wait #6631 @1.5

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 7b44f705c5f01de88db2106641c3e0da3c31d960..c33cc3b5c431c0daa09e34d17c957e9c9cc4065d 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.1'
 services:\r
   webserver:\r
     container_name: extranet-httpd\r
-    build: /home/extranet/.docker/images/httpd\r
+    build: /home/extranet/www/.docker/images/httpd\r
     working_dir: /application\r
     volumes:\r
       # Files\r
@@ -22,15 +22,14 @@ services:
       - '/data/extranet/www/fluidbook/cache:/application/fluidbook/cache'\r
       - '/data/extranet/www/fluidbook/collections:/application/fluidbook/collections'\r
       - '/data/extranet/www/fluidbook/cover:/application/fluidbook/cover'\r
-      - '/mnt/sshfs/fluidbook:/mnt/sshfs/fluidbook'\r
       - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache'\r
       - '/home/toolbox/www:/home/toolbox/www'\r
       - '/data/toolbox/:/data/toolbox/'\r
       - '/home/wesco:/home/wesco'\r
       # Config\r
-      - '/home/extranet/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'\r
+      - '/home/extranet/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'\r
       # External\r
-      - 'docs:/application/fluidbook/docs'\r
+      - 'fluidbook_docs:/application/fluidbook/docs'\r
     ports:\r
       - '54198:80'\r
     environment:\r
@@ -42,7 +41,7 @@ services:
 \r
   webserver-nb:\r
     container_name: extranet-httpd-nb\r
-    build: /home/extranet/.docker/images/httpd-nb\r
+    build: /home/extranet/www/.docker/images/httpd-nb\r
     working_dir: /application\r
     volumes:\r
       # Files\r
@@ -62,15 +61,14 @@ services:
       - '/data/extranet/www/fluidbook/cache:/application/fluidbook/cache'\r
       - '/data/extranet/www/fluidbook/collections:/application/fluidbook/collections'\r
       - '/data/extranet/www/fluidbook/cover:/application/fluidbook/cover'\r
-      - '/mnt/sshfs/fluidbook:/mnt/sshfs/fluidbook'\r
       - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache'\r
       - '/home/toolbox/www:/home/toolbox/www'\r
       - '/data/toolbox/:/data/toolbox/'\r
       - '/home/wesco:/home/wesco'\r
       # Config\r
-      - '/home/extranet/.docker/config/httpd/httpd-nb.conf:/usr/local/apache2/conf/httpd.conf'\r
+      - '/home/extranet/www/.docker/config/httpd/httpd-nb.conf:/usr/local/apache2/conf/httpd.conf'\r
       # External\r
-      - 'docs:/application/fluidbook/docs'\r
+      - 'fluidbook_docs:/application/fluidbook/docs'\r
     ports:\r
       - '54842:80'\r
     environment:\r
@@ -82,7 +80,7 @@ services:
 \r
   php-fpm:\r
     container_name: extranet\r
-    build: /home/extranet/.docker/images/php\r
+    build: /home/extranet/www/.docker/images/php\r
     working_dir: /application\r
     hostname: extranet\r
     environment:\r
@@ -90,36 +88,36 @@ services:
       HOME: /application\r
     volumes:\r
       # SSH\r
-      - '/home/extranet/.docker/config/ssh/root/:/root/.ssh/'\r
-      - '/home/extranet/.docker/config/ssh/user/:/application/.ssh/'\r
-      - '/home/extranet/.docker/config/ssh/server/:/etc/ssh/'\r
+      - '/home/extranet/www/.docker/config/ssh/root/:/root/.ssh/'\r
+      - '/home/extranet/www/.docker/config/ssh/user/:/application/.ssh/'\r
+      - '/home/extranet/www/.docker/config/ssh/server/:/etc/ssh/'\r
       # Rsyslog\r
-      - '/home/extranet/.docker/config/rsyslog/rsyslog.conf:/etc/rsyslog.conf'\r
-      - '/home/extranet/.docker/config/rsyslog/50-default.conf:/etc/rsyslog.d/50-default.conf'\r
+      - '/home/extranet/www/.docker/config/rsyslog/rsyslog.conf:/etc/rsyslog.conf'\r
+      - '/home/extranet/www/.docker/config/rsyslog/50-default.conf:/etc/rsyslog.d/50-default.conf'\r
       # Composer\r
-      - '/home/extranet/.docker/config/composer/:/root/.config/composer/'\r
-      - '/home/extranet/.docker/config/composer/:/application/.config/composer/'\r
+      - '/home/extranet/www/.docker/config/composer/:/root/.config/composer/'\r
+      - '/home/extranet/www/.docker/config/composer/:/application/.config/composer/'\r
       # NPM\r
-      - '/home/extranet/.docker/config/npm/:/root/.npm/'\r
+      - '/home/extranet/www/.docker/config/npm/:/root/.npm/'\r
       # GIT\r
-      - '/home/extranet/.docker/config/gitconfig:/root/.gitconfig'\r
-      - '/home/extranet/.docker/config/git/:/root/.config/git/'\r
-      - '/home/extranet/.docker/config/git/:/application/.config/git/'\r
-      - '/home/extranet/.docker/config/gitconfig:/application/.gitconfig'\r
+      - '/home/extranet/www/.docker/config/gitconfig:/root/.gitconfig'\r
+      - '/home/extranet/www/.docker/config/git/:/root/.config/git/'\r
+      - '/home/extranet/www/.docker/config/git/:/application/.config/git/'\r
+      - '/home/extranet/www/.docker/config/gitconfig:/application/.gitconfig'\r
       # Monit\r
-      - '/home/extranet/.docker/config/monit/:/etc/monit/'\r
-      - '/home/extranet/.docker/config/monit/id:/var/lib/monit/id'\r
+      - '/home/extranet/www/.docker/config/monit/:/etc/monit/'\r
+      - '/home/extranet/www/.docker/config/monit/id:/var/lib/monit/id'\r
       # Sudo\r
-      - '/home/extranet/.docker/config/sudoers:/etc/sudoers.d/extranet'\r
+      - '/home/extranet/www/.docker/config/sudoers:/etc/sudoers.d/extranet'\r
       # PHP\r
-      - '/home/extranet/.docker/config/php.ini:/etc/php/7.2/fpm/conf.d/99-overrides.ini'\r
+      - '/home/extranet/www/.docker/config/php.ini:/etc/php/7.2/fpm/conf.d/99-overrides.ini'\r
       - '/home/extranet/sessions/:/var/lib/php/sessions/'\r
       # Crontab\r
-      - '/home/extranet/.docker/config/cron/crontab:/etc/crontab'\r
+      - '/home/extranet/www/.docker/config/cron/crontab:/etc/crontab'\r
       # Passwords\r
-      - '/home/extranet/.docker/config/passwords:/root/passwords'\r
+      - '/home/extranet/www/.docker/config/passwords:/root/passwords'\r
       # ImageMagick\r
-      - '/home/extranet/.docker/config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml'\r
+      - '/home/extranet/www/.docker/config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml'\r
       # Files\r
       - '/data/extranet/ftp:/ftp'\r
       - '/home/extranet/fonts/:/fonts/'\r
@@ -137,13 +135,13 @@ services:
       - '/data/extranet/www/fluidbook/cache:/application/fluidbook/cache'\r
       - '/data/extranet/www/fluidbook/collections:/application/fluidbook/collections'\r
       - '/data/extranet/www/fluidbook/cover:/application/fluidbook/cover'\r
-      - '/mnt/sshfs/fluidbook:/mnt/sshfs/fluidbook'\r
       - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache'\r
       - '/home/toolbox/www:/home/toolbox/www'\r
       - '/data/toolbox/:/data/toolbox/'\r
       - '/home/wesco:/home/wesco'\r
       # External\r
-      - 'docs:/application/fluidbook/docs'\r
+      - 'fluidbook_docs:/application/fluidbook/docs'\r
+      - 'fluidbook_hosting:/mnt/sshfs/fluidbook/data/fluidbook/hosting'\r
     tmpfs:\r
       #- '/tmp:mode=777,uid=1002,gid=33'\r
       - '/var/log/extranet:uid=1002,gid=33'\r
@@ -181,9 +179,16 @@ networks:
       name: fluidbook-processfarm\r
 \r
 volumes:\r
-  docs:\r
+  fluidbook_docs:\r
     driver: ucphhpc/sshfs:latest\r
     driver_opts:\r
       sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs"\r
       allow_other: ""\r
       password: "Qu2E9uq48bBzsqGiZA"\r
+\r
+  fluidbook_hosting:\r
+    driver: ucphhpc/sshfs:latest\r
+    driver_opts:\r
+      sshcmd: "fluidbook@godzilla.cubedesigners.com:/data/fluidbook/hosting"\r
+      allow_other: ""\r
+      password: "ziuJEejpYoPH6efpDyN"\r

diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index 6fe9437d8cebf39df4152bc157205e1a179549e5..487d936dea76a6c933ee74b07e3ab43bcd50f29a 100644 (file)
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -14,7 +14,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Compile NSISbi
 RUN apt update && apt -y --no-install-recommends install build-essential scons mingw-w64 zlib1g-dev curl unzip ca-certificates wget gnupg
-RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.08.1/nsis-code-7336-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7336-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu"
+RUN cd /root && curl -L https://master.dl.sourceforge.net/project/nsisbi/nsisbi3.09.1/nsis-code-7405-1-NSIS-trunk.zip -o /root/nsis.zip && unzip -o /root/nsis.zip && cd /root/nsis-code-7405-1-NSIS-trunk && scons SKIPUTILS="zip2exe","NSIS Menu" && scons install SKIPUTILS="zip2exe","NSIS Menu"
 
 # Add additional repositories
 RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -

diff --git a/.docker/update b/.docker/update
index 785b2f03bc4b87c392eacf3c9420b24bf92efb6a..d2e8dd623cbec9e4e9f4fd58c1c5fc85ba7a688d 100644 (file)
--- a/.docker/update
+++ b/.docker/update
@@ -5,6 +5,7 @@ chown root:root /home/extranet/.docker/config/cron/host;ln -sf /home/extranet/.d
 docker network create extranet
 ./build
 docker compose down
-docker volume rm extranet_docs
+docker volume rm extranet_fluidbook_docs
+docker volume rm extranet_fluidbook_hosting
 docker compose up -d
 /home/extranet/www/bin/fixrights
\ No newline at end of file

diff --git a/inc/extranet/Metier/class.extranet.document.php b/inc/extranet/Metier/class.extranet.document.php
index 3a7aa0c26ad27ac3b599f583632fc7f3989e87b4..f8629ac432c1b14b9a409422ba0159597d58ebdc 100644 (file)
--- a/inc/extranet/Metier/class.extranet.document.php
+++ b/inc/extranet/Metier/class.extranet.document.php
@@ -110,6 +110,9 @@ abstract class extranetDocument extends cubeMetier
 \r
         // blocs\r
         $this->pdf->setY(115);\r
+\r
+        $compactMode = ($this instanceof extranetFacture && count($this->lignes) > 10);\r
+\r
         foreach ($this->lignes as $i => $ligne) {\r
             if ($pages > 1 && $i == $cesures[$page]) {\r
                 $page++;\r
@@ -124,7 +127,8 @@ abstract class extranetDocument extends cubeMetier
                 $this->pdf->setY(25);\r
             }\r
 \r
-            $y = $this->pdf->getY() + 4;\r
+            $offset = $compactMode ? 1.5 : 4;\r
+            $y = $this->pdf->getY() + $offset;\r
 \r
             $this->pdf->SetFont('Klavika', '', 10);\r
             // Prix\r

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index a616733f91a77608cbff6266f20532252acd7d92..7f228ce4ec103b43c0b74026c9056a3fcdf11785 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1464,6 +1464,8 @@ class wsMaintenance
 
         global $core;
 
+        return;
+
         $book_id = $args[0];
         $force = isset($args[1]) && $args[1] != '0';
 
@@ -1762,7 +1764,7 @@ class wsMaintenance
 
         foreach ($files as $file) {
             echo '<h2>' . json_encode($file) . '</h2>';
-            $path = $doc->getFile($page, $file[0], $file[1], 85, $file[2], $file[3], $file[4], true);
+            $path = $doc->getFile($page, $file[0], $file[1], 85, $file[2], $file[3], $file[4], false);
             echo '<p>' . $path . '</p>';
             $path = str_replace('/data1/extranet/www/', 'https://workshop.fluidbook.com/', $path);
             $path = str_replace('/home/extranet/www/', 'https://workshop.fluidbook.com/', $path);