Compare commits

..

No commits in common. 'master' and 'master' have entirely different histories.

  1. 22
      docker-compose.yml
  2. 16
      web/nginx.conf

@ -2,7 +2,7 @@ version: '3'
services:
db:
image: postgres:11-alpine
image: postgres:alpine
restart: always
volumes:
- db:/var/lib/postgresql/data
@ -46,29 +46,11 @@ services:
while /bin/true; do
echo Starting cron
su -s "/bin/sh" -c "/usr/local/bin/php /var/www/html/cron.php" www-data
echo \$$(date) - Running cron finished
echo $$(date) - Running cron finished
sleep 900
done
EOF'
thumbnailer:
image: nextcloud:fpm-alpine
restart: always
volumes:
- nextcloud:/var/www/html
depends_on:
- app
entrypoint: |
sh -c 'sh -s <<EOF
trap "break;exit" SIGHUP SIGINT SIGTERM
while /bin/true; do
echo Starting thumbnail cron
su -s "/bin/sh" -c "/usr/local/bin/php occ preview:pre-generate" www-data
echo \$$(date) - Running thumbnail cron finished
sleep 60
done
EOF'
proxy:
build: ./proxy
restart: always

@ -94,7 +94,7 @@ http {
#pagespeed off;
location / {
rewrite ^ /index.php;
rewrite ^ /index.php$request_uri;
}
location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
@ -104,16 +104,14 @@ http {
deny all;
}
location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) {
fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
try_files $fastcgi_script_name =404;
location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\.php(?:$|/) {
fastcgi_split_path_info ^(.+\.php)(/.*)$;
include fastcgi_params;
fastcgi_param SCRIPTFILENAME $document_root$fastcgi_script_name;
fastcgi_param PATHINFO $fastcgi_path_info;
fastcgi_param HTTPS on;
# Avoid sending the security headers twice
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
# fastcgi_param HTTPS on;
#Avoid sending the security headers twice
fastcgi_param modHeadersAvailable true;
# Enable pretty urls
fastcgi_param front_controller_active true;
fastcgi_pass php-handler;
fastcgi_intercept_errors on;

Loading…
Cancel
Save