Merge with master branch

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

View File

@ -1,2 +0,0 @@
*.conf
!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;
}
}

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;
}
}

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;
}
}