Fix indentation

This commit is contained in:
Ashley Rich 2015-11-19 12:14:30 +00:00
parent cc668860d4
commit 112e304c1f
11 changed files with 224 additions and 224 deletions

View File

@ -23,28 +23,28 @@ gzip_min_length 256;
# Compress the following MIME types.
gzip_types
application/atom+xml
application/javascript
application/json
application/ld+json
application/manifest+json
application/rss+xml
application/vnd.geo+json
application/vnd.ms-fontobject
application/x-font-ttf
application/x-web-app-manifest+json
application/xhtml+xml
application/xml
font/opentype
image/bmp
image/svg+xml
image/x-icon
text/cache-manifest
text/css
text/plain
text/vcard
text/vnd.rim.location.xloc
text/vtt
text/x-component
text/x-cross-domain-policy;
application/atom+xml
application/javascript
application/json
application/ld+json
application/manifest+json
application/rss+xml
application/vnd.geo+json
application/vnd.ms-fontobject
application/x-font-ttf
application/x-web-app-manifest+json
application/xhtml+xml
application/xml
font/opentype
image/bmp
image/svg+xml
image/x-icon
text/cache-manifest
text/css
text/plain
text/vcard
text/vnd.rim.location.xloc
text/vtt
text/x-component
text/x-cross-domain-policy;
# text/html is always compressed when enabled.

View File

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

View File

@ -13,7 +13,7 @@ worker_rlimit_nofile 8192;
pid /run/nginx.pid;
events {
# Set the maximum number of connection each worker process can open
# Set the maximum number of connection each worker process can open
worker_connections 8000;
# Accept all new connections at a time
@ -22,10 +22,10 @@ events {
http {
# HTTP
include global/http.conf;
# HTTP
include global/http.conf;
# MIME Types
# MIME Types
include global/mime-types.conf;
default_type application/octet-stream;
@ -33,17 +33,17 @@ http {
include global/limits.conf;
# Default Logs
error_log /var/log/nginx/error.log warn;
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log warn;
access_log /var/log/nginx/access.log;
# Gzip
include global/gzip.conf;
# Security
include global/security.conf;
include global/security.conf;
# Modules
include /etc/nginx/conf.d/*.conf;
# Modules
include /etc/nginx/conf.d/*.conf;
# Sites
include /etc/nginx/sites-enabled/*;

View File

@ -1,22 +1,22 @@
# cache.appcache, your document html and data
location ~* \.(?:manifest|appcache|html?|xml|json)$ {
expires -1;
expires -1;
}
# Feed
location ~* \.(?:rss|atom)$ {
expires 1h;
add_header Cache-Control "public";
expires 1h;
add_header Cache-Control "public";
}
# Media: images, icons, video, audio, HTC
location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
expires 1y;
add_header Cache-Control "public";
expires 1y;
add_header Cache-Control "public";
}
# CSS and Javascript
location ~* \.(?:css|js)$ {
expires 1y;
add_header Cache-Control "public";
expires 1y;
add_header Cache-Control "public";
}

View File

@ -25,6 +25,6 @@ location = /robots.txt {
# Don't record error/access logs for static assets.
location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc|css|js)$ {
log_not_found off;
access_log off;
log_not_found off;
access_log off;
}

View File

@ -1,6 +1,6 @@
# Try static files before passing to ms-files.php.
location ~ ^/[_0-9a-zA-Z-]+/files/(.*)$ {
try_files /wp-content/blogs.dir/$blogid/files/$2 /wp-includes/ms-files.php?file=$2;
try_files /wp-content/blogs.dir/$blogid/files/$2 /wp-includes/ms-files.php?file=$2;
}
# Rewrite multisite '.../wp-.*' and '.../*.php'.

View File

@ -4,19 +4,19 @@
fastcgi_cache_path /sites/fastcgi-cache.com/cache levels=1:2 keys_zone=fastcgi-cache.com:100m inactive=60m;
server {
# Ports to listen on
listen 80;
# Ports to listen on
listen 80;
# Server name to listen for
# Server name to listen for
server_name fastcgi-cache.com;
# Path to document root
root /sites/fastcgi-cache.com/public;
# Path to document root
root /sites/fastcgi-cache.com/public;
# File to be used as index
index index.php;
# File to be used as index
index index.php;
# Overrides logs defined in global/logs.conf, allows per site logs.
# Overrides logs defined in global/logs.conf, allows per site logs.
access_log /sites/fastcgi-cache.com/logs/access.log;
error_log /sites/fastcgi-cache.com/logs/error.log;
@ -24,38 +24,38 @@ server {
include per-site/exclusions.conf;
# Cache static content
include per-site/cache.conf;
include per-site/cache.conf;
# Fastcgi cache rules
include per-site/fastcgi-cache.conf;
# Fastcgi cache rules
include per-site/fastcgi-cache.conf;
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~ \.php$ {
try_files $uri =404;
include global/fastcgi-params.conf;
try_files $uri =404;
include global/fastcgi-params.conf;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
# Skip cache based on rules in per-site/fastcgi-cache.conf.
fastcgi_cache_bypass $skip_cache;
fastcgi_no_cache $skip_cache;
# Skip cache based on rules in per-site/fastcgi-cache.conf.
fastcgi_cache_bypass $skip_cache;
fastcgi_no_cache $skip_cache;
# Define memory zone for caching. Should match key_zone in fastcgi_cache_path above.
fastcgi_cache fastcgi-cache.com;
# Define memory zone for caching. Should match key_zone in fastcgi_cache_path above.
fastcgi_cache fastcgi-cache.com;
# Define caching time.
fastcgi_cache_valid 60m;
# Define caching time.
fastcgi_cache_valid 60m;
}
}
# Redirect www to non-www
server {
listen 80;
server_name www.fastcgi-cache.com;
listen 80;
server_name www.fastcgi-cache.com;
return 301 $scheme://fastcgi-cache.com$request_uri;
return 301 $scheme://fastcgi-cache.com$request_uri;
}

View File

@ -1,46 +1,46 @@
server {
# Ports to listen on
listen 80;
# Ports to listen on
listen 80;
# Server name to listen for
# Server name to listen for
server_name multisite-subdirectory.com;
# Path to document root
root /sites/multisite-subdirectory.com/public;
# Path to document root
root /sites/multisite-subdirectory.com/public;
# File to be used as index
index index.php;
# File to be used as index
index index.php;
# Overrides logs defined in global/logs.conf, allows per site logs.
# Overrides logs defined in global/logs.conf, allows per site logs.
access_log /sites/multisite-subdirectory.com/logs/access.log;
error_log /sites/multisite-subdirectory.com/logs/error.log;
# Exclusions
include per-site/exclusions.conf;
# Cache static content
include per-site/cache.conf;
# Cache static content
include per-site/cache.conf;
location / {
try_files $uri $uri/ /index.php?$args;
}
# Multisite subdirectory install
include per-site/multisite-subdirectory.conf;
# Multisite subdirectory install
include per-site/multisite-subdirectory.conf;
location ~ \.php$ {
try_files $uri =404;
include global/fastcgi-params.conf;
try_files $uri =404;
include global/fastcgi-params.conf;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
}
}
# Redirect www to non-www
server {
listen 80;
server_name www.multisite-subdirectory.com;
listen 80;
server_name www.multisite-subdirectory.com;
return 301 $scheme://multisite-subdirectory.com$request_uri;
return 301 $scheme://multisite-subdirectory.com$request_uri;
}

View File

@ -1,17 +1,17 @@
server {
# Ports to listen on
listen 80;
# Ports to listen on
listen 80;
# Server name to listen for
# Server name to listen for
server_name multisite-subdomain.com *.multisite-subdomain.com;
# Path to document root
root /sites/multisite-subdomain.com/public;
# Path to document root
root /sites/multisite-subdomain.com/public;
# File to be used as index
index index.php;
# File to be used as index
index index.php;
# Overrides logs defined in global/logs.conf, allows per site logs.
# Overrides logs defined in global/logs.conf, allows per site logs.
access_log /sites/multisite-subdomain.com/logs/access.log;
error_log /sites/multisite-subdomain.com/logs/error.log;
@ -19,25 +19,25 @@ server {
include per-site/exclusions.conf;
# Cache static content
include per-site/cache.conf;
include per-site/cache.conf;
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~ \.php$ {
try_files $uri =404;
include global/fastcgi-params.conf;
try_files $uri =404;
include global/fastcgi-params.conf;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
}
}
# Redirect www to non-www
server {
listen 80;
server_name www.multisite-subdomain.com;
listen 80;
server_name www.multisite-subdomain.com;
return 301 $scheme://multisite-subdomain.com$request_uri;
return 301 $scheme://multisite-subdomain.com$request_uri;
}

View File

@ -1,17 +1,17 @@
server {
# Ports to listen on
listen 80;
# Ports to listen on
listen 80;
# Server name to listen for
# Server name to listen for
server_name singlesite.com;
# Path to document root
root /sites/singlesite.com/public;
# Path to document root
root /sites/singlesite.com/public;
# File to be used as index
index index.php;
# File to be used as index
index index.php;
# Overrides logs defined in global/logs.conf, allows per site logs.
# Overrides logs defined in global/logs.conf, allows per site logs.
access_log /sites/singlesite.com/logs/access.log;
error_log /sites/singlesite.com/logs/error.log;
@ -19,25 +19,25 @@ server {
include per-site/exclusions.conf;
# Cache static content
include per-site/cache.conf;
include per-site/cache.conf;
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~ \.php$ {
try_files $uri =404;
include global/fastcgi-params.conf;
try_files $uri =404;
include global/fastcgi-params.conf;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
}
}
# Redirect www to non-www
server {
listen 80;
server_name www.singlesite.com;
listen 80;
server_name www.singlesite.com;
return 301 $scheme://singlesite.com$request_uri;
return 301 $scheme://singlesite.com$request_uri;
}

View File

@ -1,59 +1,59 @@
server {
# Ports to listen on, uncomment one.
listen 443 ssl;
# listen 443 ssl http2;
# Ports to listen on, uncomment one.
listen 443 ssl;
# listen 443 ssl http2;
# Server name to listen for
# Server name to listen for
server_name ssl.com;
# Path to document root
root /sites/ssl.com/public;
# Path to document root
root /sites/ssl.com/public;
# Paths to certificate files.
ssl_certificate /etc/ssl/ssl.com.crt;
ssl_certificate_key /etc/ssl/ssl.com.key;
# Paths to certificate files.
ssl_certificate /etc/ssl/ssl.com.crt;
ssl_certificate_key /etc/ssl/ssl.com.key;
# File to be used as index
index index.php;
# File to be used as index
index index.php;
# Overrides logs defined in global/logs.conf, allows per site logs.
# Overrides logs defined in global/logs.conf, allows per site logs.
access_log /sites/ssl.com/logs/access.log;
error_log /sites/ssl.com/logs/error.log;
# Exclusions
include per-site/exclusions.conf;
include per-site/exclusions.conf;
# Cache static content
include per-site/cache.conf;
include per-site/cache.conf;
# SSL rules
include per-site/ssl.conf;
# SSL rules
include per-site/ssl.conf;
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~ \.php$ {
try_files $uri =404;
include global/fastcgi-params.conf;
try_files $uri =404;
include global/fastcgi-params.conf;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
# Change socket if using PHP pools
fastcgi_pass unix:/var/run/php5-fpm.sock;
}
}
# Redirect http to https
server {
listen 80;
server_name ssl.com www.ssl.com;
listen 80;
server_name ssl.com www.ssl.com;
return 301 https://ssl.com$request_uri;
return 301 https://ssl.com$request_uri;
}
# Redirect www to non-www
server {
listen 443;
server_name www.ssl.com;
listen 443;
server_name www.ssl.com;
return 301 https://ssl.com$request_uri;
return 301 https://ssl.com$request_uri;
}