From 5d42b0f74bebe7a1c8775bbfe2e5c064bd71cf4a Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 18 Jan 2024 08:38:19 +0000 Subject: [PATCH] wait #6631 @1.5 --- .docker/docker-compose.yml | 67 ++++++++++--------- .docker/images/php/Dockerfile | 2 +- .docker/update | 3 +- .../Metier/class.extranet.document.php | 6 +- inc/ws/Controlleur/class.ws.maintenance.php | 4 +- 5 files changed, 47 insertions(+), 35 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 7b44f705c..c33cc3b5c 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.1' services: webserver: container_name: extranet-httpd - build: /home/extranet/.docker/images/httpd + build: /home/extranet/www/.docker/images/httpd working_dir: /application volumes: # Files @@ -22,15 +22,14 @@ services: - '/data/extranet/www/fluidbook/cache:/application/fluidbook/cache' - '/data/extranet/www/fluidbook/collections:/application/fluidbook/collections' - '/data/extranet/www/fluidbook/cover:/application/fluidbook/cover' - - '/mnt/sshfs/fluidbook:/mnt/sshfs/fluidbook' - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache' - '/home/toolbox/www:/home/toolbox/www' - '/data/toolbox/:/data/toolbox/' - '/home/wesco:/home/wesco' # Config - - '/home/extranet/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' + - '/home/extranet/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' # External - - 'docs:/application/fluidbook/docs' + - 'fluidbook_docs:/application/fluidbook/docs' ports: - '54198:80' environment: @@ -42,7 +41,7 @@ services: webserver-nb: container_name: extranet-httpd-nb - build: /home/extranet/.docker/images/httpd-nb + build: /home/extranet/www/.docker/images/httpd-nb working_dir: /application volumes: # Files @@ -62,15 +61,14 @@ services: - '/data/extranet/www/fluidbook/cache:/application/fluidbook/cache' - '/data/extranet/www/fluidbook/collections:/application/fluidbook/collections' - '/data/extranet/www/fluidbook/cover:/application/fluidbook/cover' - - '/mnt/sshfs/fluidbook:/mnt/sshfs/fluidbook' - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache' - '/home/toolbox/www:/home/toolbox/www' - '/data/toolbox/:/data/toolbox/' - '/home/wesco:/home/wesco' # Config - - '/home/extranet/.docker/config/httpd/httpd-nb.conf:/usr/local/apache2/conf/httpd.conf' + - '/home/extranet/www/.docker/config/httpd/httpd-nb.conf:/usr/local/apache2/conf/httpd.conf' # External - - 'docs:/application/fluidbook/docs' + - 'fluidbook_docs:/application/fluidbook/docs' ports: - '54842:80' environment: @@ -82,7 +80,7 @@ services: php-fpm: container_name: extranet - build: /home/extranet/.docker/images/php + build: /home/extranet/www/.docker/images/php working_dir: /application hostname: extranet environment: @@ -90,36 +88,36 @@ services: HOME: /application volumes: # SSH - - '/home/extranet/.docker/config/ssh/root/:/root/.ssh/' - - '/home/extranet/.docker/config/ssh/user/:/application/.ssh/' - - '/home/extranet/.docker/config/ssh/server/:/etc/ssh/' + - '/home/extranet/www/.docker/config/ssh/root/:/root/.ssh/' + - '/home/extranet/www/.docker/config/ssh/user/:/application/.ssh/' + - '/home/extranet/www/.docker/config/ssh/server/:/etc/ssh/' # Rsyslog - - '/home/extranet/.docker/config/rsyslog/rsyslog.conf:/etc/rsyslog.conf' - - '/home/extranet/.docker/config/rsyslog/50-default.conf:/etc/rsyslog.d/50-default.conf' + - '/home/extranet/www/.docker/config/rsyslog/rsyslog.conf:/etc/rsyslog.conf' + - '/home/extranet/www/.docker/config/rsyslog/50-default.conf:/etc/rsyslog.d/50-default.conf' # Composer - - '/home/extranet/.docker/config/composer/:/root/.config/composer/' - - '/home/extranet/.docker/config/composer/:/application/.config/composer/' + - '/home/extranet/www/.docker/config/composer/:/root/.config/composer/' + - '/home/extranet/www/.docker/config/composer/:/application/.config/composer/' # NPM - - '/home/extranet/.docker/config/npm/:/root/.npm/' + - '/home/extranet/www/.docker/config/npm/:/root/.npm/' # GIT - - '/home/extranet/.docker/config/gitconfig:/root/.gitconfig' - - '/home/extranet/.docker/config/git/:/root/.config/git/' - - '/home/extranet/.docker/config/git/:/application/.config/git/' - - '/home/extranet/.docker/config/gitconfig:/application/.gitconfig' + - '/home/extranet/www/.docker/config/gitconfig:/root/.gitconfig' + - '/home/extranet/www/.docker/config/git/:/root/.config/git/' + - '/home/extranet/www/.docker/config/git/:/application/.config/git/' + - '/home/extranet/www/.docker/config/gitconfig:/application/.gitconfig' # Monit - - '/home/extranet/.docker/config/monit/:/etc/monit/' - - '/home/extranet/.docker/config/monit/id:/var/lib/monit/id' + - '/home/extranet/www/.docker/config/monit/:/etc/monit/' + - '/home/extranet/www/.docker/config/monit/id:/var/lib/monit/id' # Sudo - - '/home/extranet/.docker/config/sudoers:/etc/sudoers.d/extranet' + - '/home/extranet/www/.docker/config/sudoers:/etc/sudoers.d/extranet' # PHP - - '/home/extranet/.docker/config/php.ini:/etc/php/7.2/fpm/conf.d/99-overrides.ini' + - '/home/extranet/www/.docker/config/php.ini:/etc/php/7.2/fpm/conf.d/99-overrides.ini' - '/home/extranet/sessions/:/var/lib/php/sessions/' # Crontab - - '/home/extranet/.docker/config/cron/crontab:/etc/crontab' + - '/home/extranet/www/.docker/config/cron/crontab:/etc/crontab' # Passwords - - '/home/extranet/.docker/config/passwords:/root/passwords' + - '/home/extranet/www/.docker/config/passwords:/root/passwords' # ImageMagick - - '/home/extranet/.docker/config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml' + - '/home/extranet/www/.docker/config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml' # Files - '/data/extranet/ftp:/ftp' - '/home/extranet/fonts/:/fonts/' @@ -137,13 +135,13 @@ services: - '/data/extranet/www/fluidbook/cache:/application/fluidbook/cache' - '/data/extranet/www/fluidbook/collections:/application/fluidbook/collections' - '/data/extranet/www/fluidbook/cover:/application/fluidbook/cover' - - '/mnt/sshfs/fluidbook:/mnt/sshfs/fluidbook' - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache' - '/home/toolbox/www:/home/toolbox/www' - '/data/toolbox/:/data/toolbox/' - '/home/wesco:/home/wesco' # External - - 'docs:/application/fluidbook/docs' + - 'fluidbook_docs:/application/fluidbook/docs' + - 'fluidbook_hosting:/mnt/sshfs/fluidbook/data/fluidbook/hosting' tmpfs: #- '/tmp:mode=777,uid=1002,gid=33' - '/var/log/extranet:uid=1002,gid=33' @@ -181,9 +179,16 @@ networks: name: fluidbook-processfarm volumes: - docs: + fluidbook_docs: driver: ucphhpc/sshfs:latest driver_opts: sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs" allow_other: "" password: "Qu2E9uq48bBzsqGiZA" + + fluidbook_hosting: + driver: ucphhpc/sshfs:latest + driver_opts: + sshcmd: "fluidbook@godzilla.cubedesigners.com:/data/fluidbook/hosting" + allow_other: "" + password: "ziuJEejpYoPH6efpDyN" diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile index 6fe9437d8..487d936de 100644 --- 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 785b2f03b..d2e8dd623 100644 --- 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 3a7aa0c26..f8629ac43 100644 --- 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 // blocs $this->pdf->setY(115); + + $compactMode = ($this instanceof extranetFacture && count($this->lignes) > 10); + foreach ($this->lignes as $i => $ligne) { if ($pages > 1 && $i == $cesures[$page]) { $page++; @@ -124,7 +127,8 @@ abstract class extranetDocument extends cubeMetier $this->pdf->setY(25); } - $y = $this->pdf->getY() + 4; + $offset = $compactMode ? 1.5 : 4; + $y = $this->pdf->getY() + $offset; $this->pdf->SetFont('Klavika', '', 10); // Prix diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index a616733f9..7f228ce4e 100644 --- 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 '

' . json_encode($file) . '

'; - $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 '

' . $path . '

'; $path = str_replace('/data1/extranet/www/', 'https://workshop.fluidbook.com/', $path); $path = str_replace('/home/extranet/www/', 'https://workshop.fluidbook.com/', $path); -- 2.39.5