From 184a35da243c00d1a30adb3df6e3db5abab98ff0 Mon Sep 17 00:00:00 2001 From: andryyy Date: Thu, 22 Dec 2016 12:20:26 +0100 Subject: [PATCH] Format --- data/conf/nginx/dynmaps.conf | 30 +++--- data/conf/nginx/site.conf | 190 +++++++++++++++++------------------ 2 files changed, 110 insertions(+), 110 deletions(-) diff --git a/data/conf/nginx/dynmaps.conf b/data/conf/nginx/dynmaps.conf index 8394870a..86d52fd7 100644 --- a/data/conf/nginx/dynmaps.conf +++ b/data/conf/nginx/dynmaps.conf @@ -1,18 +1,18 @@ server { - listen 8081; - index index.php index.html; - server_name _; - error_log /var/log/nginx/error.log; - access_log /var/log/nginx/access.log; - root /dynmaps; + listen 8081; + index index.php index.html; + server_name _; + error_log /var/log/nginx/error.log; + access_log /var/log/nginx/access.log; + root /dynmaps; - location ~ \.php$ { - try_files $uri =404; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass phpfpm:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass phpfpm:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + } } diff --git a/data/conf/nginx/site.conf b/data/conf/nginx/site.conf index 07578a4c..6653f6db 100644 --- a/data/conf/nginx/site.conf +++ b/data/conf/nginx/site.conf @@ -1,107 +1,107 @@ server { - listen 443; - ssl on; - ssl_certificate /etc/ssl/mail/cert.pem; - ssl_certificate_key /etc/ssl/mail/key.pem; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; - ssl_ecdh_curve secp384r1; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; - index index.php index.html; - server_name _ autodiscover.* autoconfig.*; - error_log /var/log/nginx/error.log; - access_log /var/log/nginx/access.log; - root /web; + listen 443; + ssl on; + ssl_certificate /etc/ssl/mail/cert.pem; + ssl_certificate_key /etc/ssl/mail/key.pem; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; + ssl_ecdh_curve secp384r1; + add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"; + index index.php index.html; + server_name _ autodiscover.* autoconfig.*; + error_log /var/log/nginx/error.log; + access_log /var/log/nginx/access.log; + root /web; - location ~ \.php$ { - try_files $uri =404; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass phpfpm:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - } + location ~ \.php$ { + try_files $uri =404; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass phpfpm:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + } - rewrite ^(/save.+)$ /rspamd$1 last; - location /rspamd/ { - proxy_pass http://rspamd:11334/; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains"; - add_header X-Content-Type-Options nosniff; - add_header X-Frame-Options SAMEORIGIN; - add_header X-XSS-Protection "1; mode=block"; - } + rewrite ^(/save.+)$ /rspamd$1 last; + location /rspamd/ { + proxy_pass http://rspamd:11334/; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + add_header Strict-Transport-Security "max-age=31536000; includeSubdomains"; + add_header X-Content-Type-Options nosniff; + add_header X-Frame-Options SAMEORIGIN; + add_header X-XSS-Protection "1; mode=block"; + } - location ^~ /inc/init.sql { - deny all; - } + location ^~ /inc/init.sql { + deny all; + } - if ($host ~* autodiscover\.(.*)) { - rewrite ^(.*) /autodiscover.php last; - } + if ($host ~* autodiscover\.(.*)) { + rewrite ^(.*) /autodiscover.php last; + } - if ($host ~* autoconfig\.(.*)) { - rewrite ^(.*) /autoconfig.php last; - } + if ($host ~* autoconfig\.(.*)) { + rewrite ^(.*) /autoconfig.php last; + } - location ^~ /Microsoft-Server-ActiveSync { - proxy_pass http://sogo/SOGo/Microsoft-Server-ActiveSync; - proxy_connect_timeout 1000; - proxy_next_upstream timeout error; - proxy_send_timeout 1000; - proxy_read_timeout 1000; - proxy_buffer_size 8k; - proxy_buffers 4 32k; - proxy_temp_file_write_size 64k; - proxy_busy_buffers_size 64k; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - proxy_set_header x-webobjects-server-protocol HTTP/1.0; - proxy_set_header x-webobjects-remote-host $remote_addr; - proxy_set_header x-webobjects-server-name $server_name; - proxy_set_header x-webobjects-server-url $scheme://$host; - proxy_set_header x-webobjects-server-port $server_port; - client_body_buffer_size 128k; - client_max_body_size 100m; - } + location ^~ /Microsoft-Server-ActiveSync { + proxy_pass http://sogo/SOGo/Microsoft-Server-ActiveSync; + proxy_connect_timeout 1000; + proxy_next_upstream timeout error; + proxy_send_timeout 1000; + proxy_read_timeout 1000; + proxy_buffer_size 8k; + proxy_buffers 4 32k; + proxy_temp_file_write_size 64k; + proxy_busy_buffers_size 64k; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_set_header x-webobjects-server-protocol HTTP/1.0; + proxy_set_header x-webobjects-remote-host $remote_addr; + proxy_set_header x-webobjects-server-name $server_name; + proxy_set_header x-webobjects-server-url $scheme://$host; + proxy_set_header x-webobjects-server-port $server_port; + client_body_buffer_size 128k; + client_max_body_size 100m; + } - location ^~ /SOGo { - proxy_pass http://sogo:20000; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - proxy_set_header x-webobjects-server-protocol HTTP/1.0; - proxy_set_header x-webobjects-remote-host $remote_addr; - proxy_set_header x-webobjects-server-name $server_name; - proxy_set_header x-webobjects-server-url $scheme://$host; - proxy_set_header x-webobjects-server-port $server_port; - #proxy_connect_timeout 90; - #proxy_send_timeout 90; - #proxy_read_timeout 90; - #proxy_buffer_size 4k; - #proxy_buffers 4 32k; - #proxy_busy_buffers_size 64k; - #proxy_temp_file_write_size 64k; - client_body_buffer_size 128k; - client_max_body_size 100m; - break; - } + location ^~ /SOGo { + proxy_pass http://sogo:20000; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_set_header x-webobjects-server-protocol HTTP/1.0; + proxy_set_header x-webobjects-remote-host $remote_addr; + proxy_set_header x-webobjects-server-name $server_name; + proxy_set_header x-webobjects-server-url $scheme://$host; + proxy_set_header x-webobjects-server-port $server_port; + #proxy_connect_timeout 90; + #proxy_send_timeout 90; + #proxy_read_timeout 90; + #proxy_buffer_size 4k; + #proxy_buffers 4 32k; + #proxy_busy_buffers_size 64k; + #proxy_temp_file_write_size 64k; + client_body_buffer_size 128k; + client_max_body_size 100m; + break; + } - location /SOGo.woa/WebServerResources/ { - alias /usr/lib/GNUstep/SOGo/WebServerResources/; - allow all; - } + location /SOGo.woa/WebServerResources/ { + alias /usr/lib/GNUstep/SOGo/WebServerResources/; + allow all; + } - location /SOGo/WebServerResources/ { - alias /usr/lib/GNUstep/SOGo/WebServerResources/; - allow all; - } + location /SOGo/WebServerResources/ { + alias /usr/lib/GNUstep/SOGo/WebServerResources/; + allow all; + } - location (^/SOGo/so/ControlPanel/Products/[^/]*UI/Resources/.*\.(jpg|png|gif|css|js)$ { - alias /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2; - } + location (^/SOGo/so/ControlPanel/Products/[^/]*UI/Resources/.*\.(jpg|png|gif|css|js)$ { + alias /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2; + } }