diff --git a/Dockerfile b/Dockerfile index 38365e8ba877ddb135d60912f04337fb4592ef99..a28d4937313c79798b82c8c4d1779740dac84662 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,7 @@ RUN apk add --update \ php7-json \ php7-pcntl \ php7-opcache \ + php7-fileinfo \ && rm -rf /var/cache/apk/* WORKDIR /html @@ -37,6 +38,7 @@ RUN sed -i 's/user = nobody/user = nginx/g' /etc/php7/php-fpm.d/www.conf && \ sed -i 's/user = www-data/user = nginx/g' /etc/php7/php-fpm.d/www.conf && \ sed -i 's/group = www-data/group = nginx/g' /etc/php7/php-fpm.d/www.conf && \ sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php7/php.ini && \ + sed -i 's/expose_php = On/expose_php = Off/g' /etc/php7/php.ini && \ # Opcache configuration sed -i 's/;opcache.enable=1/opcache.enable=1/g' /etc/php7/php.ini && \ sed -i 's/;opcache.memory_consumption=128/opcache.memory_consumption=128/g' /etc/php7/php.ini && \ diff --git a/Dockerfile.dev b/Dockerfile.dev index 131aa02954b959a596888764cb200a685bc1d332..3f07e86517d4cc97d83851791c80f17bdc8e7273 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -23,7 +23,7 @@ RUN apk add --update \ php7-gd \ php7-json \ php7-pcntl \ - php7-opcache \ + php7-fileinfo \ && rm -rf /var/cache/apk/* WORKDIR /html @@ -37,14 +37,7 @@ RUN sed -i 's/user = nobody/user = nginx/g' /etc/php7/php-fpm.d/www.conf && \ sed -i 's/user = www-data/user = nginx/g' /etc/php7/php-fpm.d/www.conf && \ sed -i 's/group = www-data/group = nginx/g' /etc/php7/php-fpm.d/www.conf && \ sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php7/php.ini && \ - # Opcache configuration - sed -i 's/;opcache.enable=1/opcache.enable=1/g' /etc/php7/php.ini && \ - sed -i 's/;opcache.memory_consumption=128/opcache.memory_consumption=128/g' /etc/php7/php.ini && \ - sed -i 's/;opcache.interned_strings_buffer=8/opcache.interned_strings_buffer=8/g' /etc/php7/php.ini && \ - sed -i 's/;opcache.max_accelerated_files=10000/opcache.max_accelerated_files=10000/g' /etc/php7/php.ini && \ - sed -i 's/;opcache.max_wasted_percentage=5/opcache.max_wasted_percentage=5/g' /etc/php7/php.ini && \ - sed -i 's/;opcache.validate_timestamps=1/opcache.validate_timestamps=1/g' /etc/php7/php.ini && \ - sed -i 's/;opcache.revalidate_freq=2/opcache.revalidate_freq=300/g' /etc/php7/php.ini && \ + sed -i 's/expose_php = On/expose_php = Off/g' /etc/php7/php.ini && \ echo "daemonize yes" >> /etc/redis.conf && \ ln -s /dev/null /var/log/nginx/access.log && \ ln -s /dev/stdout /var/log/nginx/error.log && \ diff --git a/routes/web.php b/routes/web.php index 9439cf8538d0eb44a06f0217128580926b45d563..16b658253b881a5d38385eea7c4137c440d95e78 100644 --- a/routes/web.php +++ b/routes/web.php @@ -87,9 +87,9 @@ Route::group( Route::get('beitritt', function () { if (LaravelLocalization::getCurrentLocale() === "de") { - return response()->file(storage_path('app/public/aufnahmeantrag-de.pdf')); + return response()->download(storage_path('app/public/aufnahmeantrag-de.pdf'), "SUMA-EV_Beitrittsformular_" . (new \DateTime())->format("Y_m_d") . ".pdf", ["Content-Type" => "application/pdf"]); } else { - return response()->file(storage_path('app/public/aufnahmeantrag-en.pdf')); + return response()->download(storage_path('app/public/aufnahmeantrag-en.pdf'), "SUMA-EV_Membershipform_" . (new \DateTime())->format("Y_m_d") . ".pdf", ["Content-Type" => "application/pdf"]); } });