lineendings nginx

This commit is contained in:
Ulf Gebhardt 2021-03-30 17:02:39 +02:00
parent b64f4748da
commit 8d530caf9a
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
4 changed files with 198 additions and 198 deletions

View File

@ -1,10 +1,10 @@
FROM nginx:latest FROM nginx:latest
WORKDIR /var/www/cakephp WORKDIR /var/www/cakephp
COPY ./nginx/nginx.conf /etc/nginx/conf.d/default.conf COPY ./nginx/nginx.conf /etc/nginx/conf.d/default.conf
COPY ./nginx/fastcgi.conf /etc/nginx/ COPY ./nginx/fastcgi.conf /etc/nginx/
COPY ./nginx/mime.types /etc/nginx/ COPY ./nginx/mime.types /etc/nginx/
COPY ./community_server/webroot webroot COPY ./community_server/webroot webroot

View File

@ -1,25 +1,25 @@
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param QUERY_STRING $query_string; fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method; fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param CONTENT_TYPE $content_type; fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length; fastcgi_param CONTENT_LENGTH $content_length;
fastcgi_param SCRIPT_NAME $fastcgi_script_name; fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri; fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri; fastcgi_param DOCUMENT_URI $document_uri;
fastcgi_param DOCUMENT_ROOT $document_root; fastcgi_param DOCUMENT_ROOT $document_root;
fastcgi_param SERVER_PROTOCOL $server_protocol; fastcgi_param SERVER_PROTOCOL $server_protocol;
fastcgi_param REQUEST_SCHEME $scheme; fastcgi_param REQUEST_SCHEME $scheme;
fastcgi_param HTTPS $https if_not_empty; fastcgi_param HTTPS $https if_not_empty;
fastcgi_param GATEWAY_INTERFACE CGI/1.1; fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
fastcgi_param REMOTE_ADDR $remote_addr; fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_param REMOTE_PORT $remote_port; fastcgi_param REMOTE_PORT $remote_port;
fastcgi_param SERVER_ADDR $server_addr; fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port; fastcgi_param SERVER_PORT $server_port;
fastcgi_param SERVER_NAME $server_name; fastcgi_param SERVER_NAME $server_name;
# PHP only, required if PHP was built with --enable-force-cgi-redirect # PHP only, required if PHP was built with --enable-force-cgi-redirect
fastcgi_param REDIRECT_STATUS 200; fastcgi_param REDIRECT_STATUS 200;

View File

@ -1,88 +1,88 @@
types { types {
text/html html htm shtml; text/html html htm shtml;
text/css css; text/css css;
text/xml xml; text/xml xml;
image/gif gif; image/gif gif;
image/jpeg jpeg jpg; image/jpeg jpeg jpg;
application/javascript js; application/javascript js;
application/atom+xml atom; application/atom+xml atom;
application/rss+xml rss; application/rss+xml rss;
text/mathml mml; text/mathml mml;
text/plain txt; text/plain txt;
text/vnd.sun.j2me.app-descriptor jad; text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml; text/vnd.wap.wml wml;
text/x-component htc; text/x-component htc;
image/png png; image/png png;
image/tiff tif tiff; image/tiff tif tiff;
image/vnd.wap.wbmp wbmp; image/vnd.wap.wbmp wbmp;
image/x-icon ico; image/x-icon ico;
image/x-jng jng; image/x-jng jng;
image/x-ms-bmp bmp; image/x-ms-bmp bmp;
image/svg+xml svg svgz; image/svg+xml svg svgz;
image/webp webp; image/webp webp;
application/font-woff woff; application/font-woff woff;
application/java-archive jar war ear; application/java-archive jar war ear;
application/json json; application/json json;
application/mac-binhex40 hqx; application/mac-binhex40 hqx;
application/msword doc; application/msword doc;
application/pdf pdf; application/pdf pdf;
application/postscript ps eps ai; application/postscript ps eps ai;
application/rtf rtf; application/rtf rtf;
application/vnd.apple.mpegurl m3u8; application/vnd.apple.mpegurl m3u8;
application/vnd.ms-excel xls; application/vnd.ms-excel xls;
application/vnd.ms-fontobject eot; application/vnd.ms-fontobject eot;
application/vnd.ms-powerpoint ppt; application/vnd.ms-powerpoint ppt;
application/vnd.wap.wmlc wmlc; application/vnd.wap.wmlc wmlc;
application/vnd.google-earth.kml+xml kml; application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz; application/vnd.google-earth.kmz kmz;
application/x-7z-compressed 7z; application/x-7z-compressed 7z;
application/x-cocoa cco; application/x-cocoa cco;
application/x-java-archive-diff jardiff; application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp; application/x-java-jnlp-file jnlp;
application/x-makeself run; application/x-makeself run;
application/x-perl pl pm; application/x-perl pl pm;
application/x-pilot prc pdb; application/x-pilot prc pdb;
application/x-rar-compressed rar; application/x-rar-compressed rar;
application/x-redhat-package-manager rpm; application/x-redhat-package-manager rpm;
application/x-sea sea; application/x-sea sea;
application/x-shockwave-flash swf; application/x-shockwave-flash swf;
application/x-stuffit sit; application/x-stuffit sit;
application/x-tcl tcl tk; application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt; application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi; application/x-xpinstall xpi;
application/xhtml+xml xhtml; application/xhtml+xml xhtml;
application/xspf+xml xspf; application/xspf+xml xspf;
application/zip zip; application/zip zip;
application/octet-stream bin exe dll; application/octet-stream bin exe dll;
application/octet-stream deb; application/octet-stream deb;
application/octet-stream dmg; application/octet-stream dmg;
application/octet-stream iso img; application/octet-stream iso img;
application/octet-stream msi msp msm; application/octet-stream msi msp msm;
application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; application/vnd.openxmlformats-officedocument.wordprocessingml.document docx;
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx;
application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; application/vnd.openxmlformats-officedocument.presentationml.presentation pptx;
audio/midi mid midi kar; audio/midi mid midi kar;
audio/mpeg mp3; audio/mpeg mp3;
audio/ogg ogg; audio/ogg ogg;
audio/x-m4a m4a; audio/x-m4a m4a;
audio/x-realaudio ra; audio/x-realaudio ra;
video/3gpp 3gpp 3gp; video/3gpp 3gpp 3gp;
video/mp2t ts; video/mp2t ts;
video/mp4 mp4; video/mp4 mp4;
video/mpeg mpeg mpg; video/mpeg mpeg mpg;
video/quicktime mov; video/quicktime mov;
video/webm webm; video/webm webm;
video/x-flv flv; video/x-flv flv;
video/x-m4v m4v; video/x-m4v m4v;
video/x-mng mng; video/x-mng mng;
video/x-ms-asf asx asf; video/x-ms-asf asx asf;
video/x-ms-wmv wmv; video/x-ms-wmv wmv;
video/x-msvideo avi; video/x-msvideo avi;
} }

View File

@ -1,77 +1,77 @@
server { server {
listen 80 ; listen 80 ;
listen [::]:80; listen [::]:80;
server_name 0.0.0.0; server_name 0.0.0.0;
#include /etc/nginx/common/protect.conf; #include /etc/nginx/common/protect.conf;
#include /etc/nginx/common/protect_add_header.conf; #include /etc/nginx/common/protect_add_header.conf;
#include /etc/nginx/common/ssl.conf; #include /etc/nginx/common/ssl.conf;
root /var/www/cakephp/webroot; root /var/www/cakephp/webroot;
index index.php; index index.php;
location ~* \.(png|jpg|ico|webp)$ { location ~* \.(png|jpg|ico|webp)$ {
expires 30d; expires 30d;
} }
location ~* \.(js|css) { location ~* \.(js|css) {
# expires 1d; # expires 1d;
expires 1d; expires 1d;
} }
location ~ \.php$ { location ~ \.php$ {
fastcgi_pass community-server:9000; fastcgi_pass community-server:9000;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
# fastcgi_param PHP_VALUE "error_log=/var/www/myapp/logs/php_errors.log"; # fastcgi_param PHP_VALUE "error_log=/var/www/myapp/logs/php_errors.log";
fastcgi_buffers 16 16k; fastcgi_buffers 16 16k;
fastcgi_buffer_size 32k; fastcgi_buffer_size 32k;
include fastcgi_params; include fastcgi_params;
} }
location ~ /\.ht { location ~ /\.ht {
deny all; deny all;
} }
location /account { location /account {
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade'; proxy_set_header Connection 'upgrade';
proxy_cache_bypass $http_upgrade; proxy_cache_bypass $http_upgrade;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;
rewrite /account/(.*) /$1 break; rewrite /account/(.*) /$1 break;
#proxy_next_upstream error timeout invalid_header http_502 non_idempotent; #proxy_next_upstream error timeout invalid_header http_502 non_idempotent;
proxy_pass http://login-server:1200; proxy_pass http://login-server:1200;
proxy_redirect off; proxy_redirect off;
} }
location /login_api { location /login_api {
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade'; proxy_set_header Connection 'upgrade';
proxy_cache_bypass $http_upgrade; proxy_cache_bypass $http_upgrade;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;
rewrite /login_api/(.*) /$1 break; rewrite /login_api/(.*) /$1 break;
proxy_pass http://login-server:1201; proxy_pass http://login-server:1201;
proxy_redirect off; proxy_redirect off;
} }
location / { location / {
try_files $uri $uri/ /index.php?$args; try_files $uri $uri/ /index.php?$args;
} }
# access_log /var/log/nginx/access.log main; # access_log /var/log/nginx/access.log main;
} }