ykxiao/laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with master branch

Browse Source
This commit is contained in:
ZeroC0D3 Team
2017-03-17 14:36:00 +07:00
parent 8de9eca8ae
commit 5c0933d19a
87 changed files with 1966 additions and 1705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nginx/nginx.conf
View File

@@ -23,8 +23,12 @@ http {
error_log /var/log/nginx/error.log;
gzip on;
gzip_disable "msie6";
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-available/*;
open_file_cache max=100;
open_file_cache off; # Disabled for issue 619
charset UTF-8;
}

2
nginx/sites/.gitignore vendored
View File

@@ -1,2 +0,0 @@
*.conf
!default.conf

7
nginx/sites/default.conf
View File

@@ -3,7 +3,7 @@ server {
listen 80 default_server;
listen [::]:80 default_server ipv6only=on;
server_name laradock;
server_name locahost;
root /var/www/public;
index index.php index.html index.htm;
@@ -24,6 +24,11 @@ server {
location ~ /\.ht {
deny all;
}
location /.well-known/acme-challenge/ {
root /var/www/letsencrypt/;
log_not_found off;
}
}

11
nginx/sites/sample.conf.example → nginx/sites/project-1.conf
View File

@@ -3,8 +3,8 @@ server {
listen 80;
listen [::]:80;
server_name sample.dev;
root /var/www/sample/public;
server_name project-1.dev;
root /var/www/project-1/public;
index index.php index.html index.htm;
location / {
@@ -15,6 +15,8 @@ server {
try_files $uri /index.php =404;
fastcgi_pass php-upstream;
fastcgi_index index.php;
fastcgi_buffers 16 16k;
fastcgi_buffer_size 32k;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params;
}
@@ -22,6 +24,11 @@ server {
location ~ /\.ht {
deny all;
}
location /.well-known/acme-challenge/ {
root /var/www/letsencrypt/;
log_not_found off;
}
}

35
nginx/sites/project-2.conf Normal file
View File

@@ -0,0 +1,35 @@
server {
listen 80;
listen [::]:80;
server_name project-2.dev;
root /var/www/project-2/public;
index index.php index.html index.htm;
location / {
try_files $uri $uri/ /index.php$is_args$args;
}
location ~ \.php$ {
try_files $uri /index.php =404;
fastcgi_pass php-upstream;
fastcgi_index index.php;
fastcgi_buffers 16 16k;
fastcgi_buffer_size 32k;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params;
}
location ~ /\.ht {
deny all;
}
location /.well-known/acme-challenge/ {
root /var/www/letsencrypt/;
log_not_found off;
}
}