From b3c84558bb0fc2f6a0401377d62982a293ac82a4 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Sun, 26 Jan 2025 18:13:07 +0100 Subject: [PATCH] wip #7255 @0.5 --- .docker/docker-compose.yml | 78 +- .docker/images/php/Dockerfile | 4 +- .gitignore | 14 + .idea/dataSources.local.xml | 2 +- .idea/deployment.xml | 49 +- .idea/vcs.xml | 2 +- .idea/workspace.xml | 1656 ++++++++++++++++- .../Metier/class.extranet.document.php | 7 +- inc/ws/Metier/class.ws.book.parametres.php | 2 +- 9 files changed, 1642 insertions(+), 172 deletions(-) create mode 100644 .gitignore diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 01fcb839c..daabd488b 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -1,44 +1,5 @@ version: '3.1' services: - webserver: - container_name: extranet-httpd - build: /home/extranet/www/.docker/images/httpd - working_dir: /application - volumes: - # Files - - '/data/extranet/ftp:/ftp' - - '/home/extranet/fonts/:/fonts/' - - '/home/extranet/www/:/application/' - - '/home/extranet/share:/application/share' - - '/mnt/sshfs/kingkong/:/application/usstorage/' - - '/home/toolbox/www/resources/fluidbookpublication/player:/application/fluidbook/compile/player' - - '/data/extranet/www/fluidbook/books/audiodescription:/application/fluidbook/books/audiodescription' - - '/data/extranet/www/fluidbook/books/index:/application/fluidbook/books/index' - - '/data/extranet/www/fluidbook/books/links:/application/fluidbook/books/links' - - '/data/extranet/www/fluidbook/books/pdf:/application/fluidbook/books/pdf' - - '/data/extranet/www/fluidbook/books/seo:/application/fluidbook/books/seo' - - '/data/extranet/www/fluidbook/books/html5:/application/fluidbook/books/html5' - - '/data/extranet/www/fluidbook/books/working:/application/fluidbook/books/working' - - '/data/extranet/www/fluidbook/cache:/application/fluidbook/cache' - - '/data/extranet/www/fluidbook/collections:/application/fluidbook/collections' - - '/data/extranet/www/fluidbook/cover:/application/fluidbook/cover' - - '/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/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' - # External - - 'fluidbook_docs:/application/fluidbook/docs' - ports: - - '54198:80' - environment: - VIRTUAL_HOST: exe.workshop.fluidbook.com - LETSENCRYPT_HOST: exe.workshop.fluidbook.com - networks: - - extranet - restart: unless-stopped - webserver-nb: container_name: extranet-httpd-nb build: /home/extranet/www/.docker/images/httpd-nb @@ -49,7 +10,6 @@ services: - '/home/extranet/fonts/:/fonts/' - '/home/extranet/www/:/application/' - '/home/extranet/share:/application/share' - - '/mnt/sshfs/kingkong/:/application/usstorage/' - '/home/toolbox/www/resources/fluidbookpublication/player:/application/fluidbook/compile/player' - '/data/extranet/www/fluidbook/books/audiodescription:/application/fluidbook/books/audiodescription' - '/data/extranet/www/fluidbook/books/index:/application/fluidbook/books/index' @@ -67,15 +27,12 @@ services: - '/home/wesco:/home/wesco' # Config - '/home/extranet/www/.docker/config/httpd/httpd-nb.conf:/usr/local/apache2/conf/httpd.conf' - # External - - 'fluidbook_docs:/application/fluidbook/docs' - ports: - - '54842:80' environment: - VIRTUAL_HOST: workshop.fluidbook.com, extranet.cubedesigners.com - LETSENCRYPT_HOST: workshop.fluidbook.com, extranet.cubedesigners.com + VIRTUAL_HOST: extranet.cubedesigners.com + LETSENCRYPT_HOST: extranet.cubedesigners.com networks: - extranet + - nginxproxy restart: unless-stopped php-fpm: @@ -99,11 +56,6 @@ services: - '/home/extranet/www/.docker/config/composer/:/application/.config/composer/' # NPM - '/home/extranet/www/.docker/config/npm/:/root/.npm/' - # GIT - - '/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/www/.docker/config/monit/:/etc/monit/' - '/home/extranet/www/.docker/config/monit/id:/var/lib/monit/id' @@ -123,7 +75,6 @@ services: - '/home/extranet/fonts/:/fonts/' - '/home/extranet/www/:/application/' - '/home/extranet/share:/application/share' - - '/mnt/sshfs/kingkong/:/application/usstorage/' - '/home/toolbox/www/resources/fluidbookpublication/player:/application/fluidbook/compile/player' - '/data/extranet/www/fluidbook/books/audiodescription:/application/fluidbook/books/audiodescription' - '/data/extranet/www/fluidbook/books/index:/application/fluidbook/books/index' @@ -139,9 +90,6 @@ services: - '/home/toolbox/www:/home/toolbox/www' - '/data/toolbox/:/data/toolbox/' - '/home/wesco:/home/wesco' - # External - - 'fluidbook_docs:/application/fluidbook/docs' - - 'fluidbook_hosting:/mnt/sshfs/fluidbook/data/fluidbook/hosting' tmpfs: #- '/tmp:mode=777,uid=1001,gid=33' - '/var/log/extranet:uid=1001,gid=33' @@ -150,7 +98,6 @@ services: - '51895:22' networks: - extranet - - fluidbook-processfarm restart: unless-stopped logging: driver: json-file @@ -174,21 +121,6 @@ networks: extranet: external: name: extranet - fluidbook-processfarm: + nginxproxy: external: - name: fluidbook-processfarm - -volumes: - 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" + name: nginxproxy diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile index c92e209fa..fda45236a 100644 --- a/.docker/images/php/Dockerfile +++ b/.docker/images/php/Dockerfile @@ -2,7 +2,7 @@ # PHPDocker.io PHP 8.1 / CLI and FPM image # ############################################ -FROM ubuntu:latest AS cli +FROM ubuntu:jammy AS cli WORKDIR "/application" @@ -50,7 +50,7 @@ RUN apt update && apt -y --no-install-recommends install \ php7.2-curl \ php7.2-mcrypt \ php7.2-mailparse \ - less nano wget bash lynx + less nano wget bash lynx libgd3 libavif13 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer STOPSIGNAL SIGQUIT diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..9d2b9175f --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +/fluidbook/books/ +/fluidbook/cache/ +/fluidbook/collections/ +/fluidbook/compile/ +/fluidbook/compiletime/ +/fluidbook/cover/ +/fluidbook/docs/ +/fluidbook/docs1/ +/fluidbook/icones/ +/fluidbook/links/ +/fluidbook/packager/ +/fluidbook/stats/ +/fluidbook/themes/ +/fluidbook/themes3/ diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index 1b4913cf3..04a4199db 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + #@ diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 94338e496..58cc4d76d 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -25,6 +25,13 @@ + + + + + + + @@ -130,6 +137,13 @@ + + + + + + + @@ -213,6 +227,13 @@ + + + + + + + @@ -255,6 +276,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -297,13 +339,6 @@ - - - - - - - diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 45cf85c20..35eb1ddfb 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 308cc59f8..2afb51d00 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,7 +4,1504 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -113,31 +1610,36 @@ - { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.git.unshallow": "true", + "Shell Script.Docker terminal.executor": "Run", + "WebServerToolWindowFactoryState": "true", + "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true", + "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true", + "WebServerToolWindowPanel.toolwindow.show.date": "false", + "WebServerToolWindowPanel.toolwindow.show.permissions": "false", + "WebServerToolWindowPanel.toolwindow.show.size": "false", + "git-widget-placeholder": "master", + "ignore.virus.scanning.warn.message": "true", + "ignore_missing_gitignore": "true", + "kotlin-language-version-configured": "true", + "last_opened_file_path": "D:/Works/cubeExtranet", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "project.structure.last.edited": "Problems", + "project.structure.proportion": "0.0", + "project.structure.side.proportion": "0.2", + "ruby.rails.projectView.checked": "true", + "settings.editor.selected.configurable": "preferences.pluginManager", + "vue.rearranger.settings.migration": "true" } -}]]> +} @@ -448,8 +1950,8 @@ - @@ -461,64 +1963,6 @@ - - - - @@ -2566,6 +4010,22 @@ + + + + + + + + + + + + + + + + 1674048129043 @@ -2937,6 +4397,29 @@ + + + + + +