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

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