diff --git a/dokuwiki/Dockerfile.debian b/dokuwiki/Dockerfile.debian index 033154b..5b75cac 100644 --- a/dokuwiki/Dockerfile.debian +++ b/dokuwiki/Dockerfile.debian @@ -22,4 +22,3 @@ VOLUME /var/www/html/data/pages \ /var/www/html/data/media_meta \ /var/www/html/data/attic \ /var/www/html/conf - diff --git a/dokuwiki/arm/nginx.conf b/dokuwiki/arm/nginx.conf index d66c9cd..7a213dd 100644 --- a/dokuwiki/arm/nginx.conf +++ b/dokuwiki/arm/nginx.conf @@ -1,51 +1,53 @@ -user nginx; -worker_processes 4; -pid /run/nginx.pid; +user nginx; +worker_processes 4; +pid /run/nginx.pid; events { - worker_connections 1024; + worker_connections 1024; } http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; server { - listen 80; - server_name _; - - client_max_body_size 4M; + listen 80; + server_name _; + client_max_body_size 4M; client_body_buffer_size 128k; - - root /var/www/html; - index doku.php; - - location ~ /(data/|conf/|bin/|inc/) { deny all; } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ { - expires 31536000s; - add_header Pragma "public"; - add_header Cache-Control "max-age=31536000, public, must-revalidate, proxy-revalidate"; - log_not_found off; + root /var/www/html; + index doku.php; + + location ~ /(data/|conf/|bin/|inc/) { + deny all; } - - location / { try_files $uri $uri/ @dokuwiki; } - + + location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ { + expires 31536000s; + add_header Pragma "public"; + add_header Cache-Control "max-age=31536000, public, must-revalidate, proxy-revalidate"; + log_not_found off; + } + + location / { + try_files $uri $uri/ @dokuwiki; + } + location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1&$args last; + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1&$args last; } location ~ \.php$ { - try_files $uri $uri/ /doku.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param REDIRECT_STATUS 200; - fastcgi_pass 127.0.0.1:9000; + try_files $uri $uri/ /doku.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param REDIRECT_STATUS 200; + fastcgi_pass 127.0.0.1:9000; } } } diff --git a/dokuwiki/nginx.conf b/dokuwiki/nginx.conf index d66c9cd..7a213dd 100644 --- a/dokuwiki/nginx.conf +++ b/dokuwiki/nginx.conf @@ -1,51 +1,53 @@ -user nginx; -worker_processes 4; -pid /run/nginx.pid; +user nginx; +worker_processes 4; +pid /run/nginx.pid; events { - worker_connections 1024; + worker_connections 1024; } http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; server { - listen 80; - server_name _; - - client_max_body_size 4M; + listen 80; + server_name _; + client_max_body_size 4M; client_body_buffer_size 128k; - - root /var/www/html; - index doku.php; - - location ~ /(data/|conf/|bin/|inc/) { deny all; } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ { - expires 31536000s; - add_header Pragma "public"; - add_header Cache-Control "max-age=31536000, public, must-revalidate, proxy-revalidate"; - log_not_found off; + root /var/www/html; + index doku.php; + + location ~ /(data/|conf/|bin/|inc/) { + deny all; } - - location / { try_files $uri $uri/ @dokuwiki; } - + + location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ { + expires 31536000s; + add_header Pragma "public"; + add_header Cache-Control "max-age=31536000, public, must-revalidate, proxy-revalidate"; + log_not_found off; + } + + location / { + try_files $uri $uri/ @dokuwiki; + } + location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1&$args last; + rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; + rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; + rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; + rewrite ^/(.*) /doku.php?id=$1&$args last; } location ~ \.php$ { - try_files $uri $uri/ /doku.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param REDIRECT_STATUS 200; - fastcgi_pass 127.0.0.1:9000; + try_files $uri $uri/ /doku.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param REDIRECT_STATUS 200; + fastcgi_pass 127.0.0.1:9000; } } }