поправлена работа commonlinkutility под docker

This commit is contained in:
nikolay ivanov 2015-05-06 17:03:22 +03:00
parent be7f2aa3d4
commit 923d91e6d2
2 changed files with 78 additions and 42 deletions

View File

@ -1,36 +1,57 @@
server {
listen 80;
listen 80;
location / {
root /var/www/onlyoffice/WebStudio/;
index index.html index.htm default.aspx Default.aspx;
fastcgi_index Default.aspx;
fastcgi_pass 127.0.0.1:8086;
add_header Access-Control-Allow-Origin *;
client_max_body_size 100m;
include /etc/nginx/fastcgi_params;
fastcgi_param HTTP_X_REWRITER_URL $scheme://$host:$server_port;
fastcgi_param SERVER_NAME $host;
fastcgi_param PATH_INFO "";
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_read_timeout 300;
fastcgi_send_timeout 300;
}
location / {
root /var/www/onlyoffice/WebStudio/;
index index.html index.htm default.aspx Default.aspx;
add_header Access-Control-Allow-Origin *;
client_max_body_size 4G;
access_log /var/log/onlyoffice/nginx.access.log;
error_log /var/log/onlyoffice/nginx.error.log;
fastcgi_index Default.aspx;
fastcgi_pass 127.0.0.1:8086;
fastcgi_param HTTP_X_REWRITER_URL $scheme://$http_host;
fastcgi_param SERVER_NAME $host;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO "";
fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri;
fastcgi_param DOCUMENT_ROOT $document_root;
fastcgi_param SERVER_PROTOCOL $server_protocol;
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_param REMOTE_PORT $remote_port;
fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port;
fastcgi_param HTTPS $https if_not_empty;
fastcgi_read_timeout 600;
fastcgi_send_timeout 600;
}
location ~ ^/(coauthoring|spellchecker|OfficeWeb|OnlineEditorsExample|CanvasService\.ashx|ConvertService\.ashx|fileDownloader\.ashx|FileUploader\.ashx|FontService\.ashx|ResourceService\.ashx|TrackingService\.ashx|UploadService\.ashx) {
proxy_pass {{DOCUMENT_SERVER_HOST_ADDR}};
proxy_redirect off;
client_max_body_size 100m;
client_max_body_size 100m;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $server_name;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $server_name;
}
}

View File

@ -56,30 +56,45 @@ server {
##
ssl_dhparam {{SSL_DHPARAM_PATH}};
location / {
location / {
## If you use HTTPS make sure you disable gzip compression
## to be safe against BREACH attack.
gzip off;
root /var/www/onlyoffice/WebStudio/;
index index.html index.htm default.aspx Default.aspx;
fastcgi_index Default.aspx;
fastcgi_pass 127.0.0.1:8086; error_page 500 /500.html;
add_header Access-Control-Allow-Origin *;
client_max_body_size 100m;
include /etc/nginx/fastcgi_params;
fastcgi_param HTTP_X_REWRITER_URL $scheme://$host:$server_port;
fastcgi_param SERVER_NAME $host;
fastcgi_param PATH_INFO "";
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_read_timeout 300;
fastcgi_send_timeout 300;
#access_log /var/log/onlyoffice/8.1/nginx/onlyoffice_access.log;
#error_log /var/log/onlyoffice/8.1/nginx/onlyoffice_error.log;
gzip off;
root /var/www/onlyoffice/WebStudio/;
index index.html index.htm default.aspx Default.aspx;
}
add_header Access-Control-Allow-Origin *;
client_max_body_size 4G;
access_log /var/log/onlyoffice/nginx.access.log;
error_log /var/log/onlyoffice/nginx.error.log;
fastcgi_index Default.aspx;
fastcgi_pass 127.0.0.1:8086;
fastcgi_param HTTP_X_REWRITER_URL $scheme://$host:$server_port;
fastcgi_param SERVER_NAME $host;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO "";
fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri;
fastcgi_param DOCUMENT_ROOT $document_root;
fastcgi_param SERVER_PROTOCOL $server_protocol;
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_param REMOTE_PORT $remote_port;
fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port;
fastcgi_param HTTPS $https if_not_empty;
fastcgi_read_timeout 600;
fastcgi_send_timeout 600;
}
location ~ ^/(coauthoring|spellchecker|OfficeWeb|OnlineEditorsExample|CanvasService\.ashx|ConvertService\.ashx|fileDownloader\.ashx|FileUploader\.ashx|FontService\.ashx|ResourceService\.ashx|TrackingService\.ashx|UploadService\.ashx) {
proxy_pass {{DOCUMENT_SERVER_HOST_ADDR}};
proxy_redirect off;