From e530d3690ceda5dbc0322d4e5cb9d70d9ba97575 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Sat, 27 Aug 2022 15:46:50 +0200
Subject: [PATCH] wip #5418 @1

---
 .docker/config/crontab                       | 1 -
 .docker/config/httpd/httpd.conf              | 8 ++++++++
 .docker/docker-compose.yml                   | 9 +++++----
 .docker/images/httpd/Dockerfile              | 3 +++
 .docker/{image => images/php}/Dockerfile     | 0
 .docker/{image => images/php}/overrides.conf | 0
 .docker/{image => images/php}/startup        | 0
 app/Jobs/FluidbookCompiler.php               | 2 +-
 8 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 .docker/images/httpd/Dockerfile
 rename .docker/{image => images/php}/Dockerfile (100%)
 rename .docker/{image => images/php}/overrides.conf (100%)
 rename .docker/{image => images/php}/startup (100%)

diff --git a/.docker/config/crontab b/.docker/config/crontab
index d8ce4b2c5..4acd6f4ad 100644
--- a/.docker/config/crontab
+++ b/.docker/config/crontab
@@ -3,5 +3,4 @@ SHELL=/bin/sh
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 * * * * *   runuser -l toolbox -c '/usr/bin/php /application/artisan schedule:run' > /proc/1/fd/1 2>/proc/1/fd/2
-* * * * *   echo 'Test cron' > /proc/1/fd/1 2>/proc/1/fd/2
 20 5 * * *  /application/scripts/restartworkers > /proc/1/fd/1 2>/proc/1/fd/2
diff --git a/.docker/config/httpd/httpd.conf b/.docker/config/httpd/httpd.conf
index 1126f6cdc..af7775faf 100644
--- a/.docker/config/httpd/httpd.conf
+++ b/.docker/config/httpd/httpd.conf
@@ -198,6 +198,8 @@ LoadModule dir_module modules/mod_dir.so
 LoadModule alias_module modules/mod_alias.so
 LoadModule rewrite_module modules/mod_rewrite.so
 
+LoadModule xsendfile_module /usr/lib/apache2/modules/mod_xsendfile.so
+
 <IfModule unixd_module>
 #
 # If you wish httpd to run as a different user or group, you must run
@@ -293,6 +295,12 @@ DocumentRoot "/usr/local/apache2/htdocs"
 
 ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://fluidbook-toolbox:9000/application/public/$1" timeout=1800
 
+XSendFile on
+XSendFilePath /data1/extranet
+XSendFilePath /application
+XSendFilePath /home/extranet
+
+
 #
 # DirectoryIndex: sets the file that Apache will serve if a directory
 # is requested.
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 676732bee..c11943842 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -2,11 +2,12 @@ version: '3.1'
 services:
     webserver:
         container_name: fluidbook-toolbox-httpd
-        image: 'httpd:alpine'
+        build: /data1/extranet/toolbox/.docker/images/httpd
         working_dir: /application
         volumes:
-            - '/data1/extranet/toolbox/public/:/usr/local/apache2/htdocs/'
-            - '/data1/extranet/toolbox/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
+          - '/data1/extranet/toolbox/:/application/'
+          - '/data1/extranet/toolbox/public/:/usr/local/apache2/htdocs/'
+          - '/data1/extranet/toolbox/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
         ports:
             - '37126:80'
         environment:
@@ -18,7 +19,7 @@ services:
 
     php-fpm:
         container_name: fluidbook-toolbox
-        build: /data1/extranet/toolbox/.docker/image
+        build: /data1/extranet/toolbox/.docker/images/php
         working_dir: /application
         volumes:
             - '/data1/extranet/toolbox/.docker/config/ssh/:/root/.ssh/'
diff --git a/.docker/images/httpd/Dockerfile b/.docker/images/httpd/Dockerfile
new file mode 100644
index 000000000..aab8bc21c
--- /dev/null
+++ b/.docker/images/httpd/Dockerfile
@@ -0,0 +1,3 @@
+FROM httpd
+RUN apt-get update && apt-get install -y --no-install-recommends nano less bash libapache2-mod-xsendfile
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
diff --git a/.docker/image/Dockerfile b/.docker/images/php/Dockerfile
similarity index 100%
rename from .docker/image/Dockerfile
rename to .docker/images/php/Dockerfile
diff --git a/.docker/image/overrides.conf b/.docker/images/php/overrides.conf
similarity index 100%
rename from .docker/image/overrides.conf
rename to .docker/images/php/overrides.conf
diff --git a/.docker/image/startup b/.docker/images/php/startup
similarity index 100%
rename from .docker/image/startup
rename to .docker/images/php/startup
diff --git a/app/Jobs/FluidbookCompiler.php b/app/Jobs/FluidbookCompiler.php
index 0fb18c0ae..ed2fe184a 100644
--- a/app/Jobs/FluidbookCompiler.php
+++ b/app/Jobs/FluidbookCompiler.php
@@ -1072,7 +1072,7 @@ class FluidbookCompiler extends Base implements CompilerInterface
     {
         $currenttime = microtime(true);
         if (null === $this->logfp) {
-            $this->logfp = fopen('/var/log/extranet/htmlconversions/' . $this->book_id . '.log', 'w+');
+            $this->logfp = fopen(Files::mkdir(storage_path('logs/htmlconversions')) . $this->book_id . '.log', 'w+');
         }
         if (null === $this->logtime) {
             $this->logtime = $currenttime;
-- 
2.39.5