From 690137a3490e73a111c1b994ba8cf0a140b007b8 Mon Sep 17 00:00:00 2001 From: Winfried Date: Sun, 23 Apr 2017 20:44:18 +0200 Subject: [PATCH] Changing docroots to have the same defaults Caddy, NGINX and Apache2 should have the same default application paths. The `public/` path suffix is now added in the dotenv file to be able to use Laradock for non-laravel projects as well. Also, updated the documentation. --- DOCUMENTATION/content/getting-started/index.md | 15 ++++++++++----- DOCUMENTATION/content/guides/index.md | 4 ++-- apache2/sites/sample.conf.example | 4 ++-- beanstalkd-console/Dockerfile | 2 +- caddy/Caddyfile | 2 +- caddy/Dockerfile | 2 +- env-example | 2 +- hhvm/server.ini | 2 +- nginx/sites/default.conf | 6 +++--- nginx/sites/project-1.conf.example | 6 +++--- nginx/sites/project-2.conf.example | 6 +++--- 11 files changed, 28 insertions(+), 23 deletions(-) diff --git a/DOCUMENTATION/content/getting-started/index.md b/DOCUMENTATION/content/getting-started/index.md index 9172688d..3d50c225 100644 --- a/DOCUMENTATION/content/getting-started/index.md +++ b/DOCUMENTATION/content/getting-started/index.md @@ -77,14 +77,19 @@ Your folder structure should look like this: 2 - Edit your web server sites configuration. -**In case of NGINX:** open `nginx/sites/default.conf` and change the `root` from `/var/www/public` to `/var/www/{my-project-folder-name}/public`. +We'll need to do step 1 of the [Usage](#Usage) section now to make this happen. -*Or you can keep `default.conf` as it is, and create a separate config `my-site.conf` file for it.* +``` +cp env-example .env +``` -**In case of Apache:** :P +At the top, change the `APPLICATION` variable to your project path. -
+``` +APPLICATION=../project-z/public/ +``` +Make sure to replace `project-z` with your project folder name. > **Now jump to the [Usage](#Usage) section.** @@ -146,7 +151,7 @@ If you are using **Docker Toolbox** (VM), do one of the following:
-1 - Enter the laradock folder and rename `env-example` to `.env` +1 - Enter the laradock folder and copy `env-example` to `.env` ```shell cp env-example .env diff --git a/DOCUMENTATION/content/guides/index.md b/DOCUMENTATION/content/guides/index.md index 34b92236..d109fd8a 100644 --- a/DOCUMENTATION/content/guides/index.md +++ b/DOCUMENTATION/content/guides/index.md @@ -165,14 +165,14 @@ Remove 0.0.0.0:80 ``` 0.0.0.0:80 -root /var/www/public +root /var/www ``` and replace with your https://yourdomain.com ``` https://yourdomain.com -root /var/www/public +root /var/www ``` uncomment tls diff --git a/apache2/sites/sample.conf.example b/apache2/sites/sample.conf.example index 48a132e0..20af4697 100644 --- a/apache2/sites/sample.conf.example +++ b/apache2/sites/sample.conf.example @@ -1,9 +1,9 @@ ServerName sample.dev - DocumentRoot /var/www/sample/public/ + DocumentRoot /var/www/sample/ Options Indexes FollowSymLinks - + AllowOverride All Allow from all diff --git a/beanstalkd-console/Dockerfile b/beanstalkd-console/Dockerfile index b07f1e36..2867847c 100644 --- a/beanstalkd-console/Dockerfile +++ b/beanstalkd-console/Dockerfile @@ -14,4 +14,4 @@ RUN apt-get remove --purge -y curl && \ EXPOSE 2080 -CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public' +CMD bash -c 'BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source' diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 269b62a1..488b0c05 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -1,6 +1,6 @@ # Docs: https://caddyserver.com/docs/caddyfile 0.0.0.0:80 -root /var/www/public +root /var/www fastcgi / php-fpm:9000 php { index index.php } diff --git a/caddy/Dockerfile b/caddy/Dockerfile index b10a9f52..f1a8c19f 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -19,6 +19,6 @@ RUN curl --silent --show-error --fail --location \ EXPOSE 80 443 2015 -WORKDIR /var/www/public +WORKDIR /var/www CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"] diff --git a/env-example b/env-example index 3ba06708..64b37a06 100644 --- a/env-example +++ b/env-example @@ -5,7 +5,7 @@ ### Application Path # Point to your application code, will be available at `/var/www`. -APPLICATION=../ +APPLICATION=../public/ ### Data Path: # For all storage systems. diff --git a/hhvm/server.ini b/hhvm/server.ini index 8cd55695..992bf63c 100644 --- a/hhvm/server.ini +++ b/hhvm/server.ini @@ -12,7 +12,7 @@ hhvm.log.level = Error hhvm.log.header = true hhvm.log.access[default][file] = /var/log/hhvm/access.log hhvm.log.access[default][format] = "%h %l %u %t \"%r\" %>s %b" -hhvm.server.source_root=/var/www/public +hhvm.server.source_root=/var/www hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc ; Uncomment to log to files instead of STDOUT diff --git a/nginx/sites/default.conf b/nginx/sites/default.conf index 8e0e75f5..a0b05c86 100644 --- a/nginx/sites/default.conf +++ b/nginx/sites/default.conf @@ -4,7 +4,7 @@ server { listen [::]:80 default_server ipv6only=on; server_name localhost; - root /var/www/public; + root /var/www; index index.php index.html index.htm; location / { @@ -15,7 +15,7 @@ server { try_files $uri /index.php =404; fastcgi_pass php-upstream; fastcgi_index index.php; - fastcgi_buffers 16 16k; + fastcgi_buffers 16 16k; fastcgi_buffer_size 32k; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params; @@ -24,7 +24,7 @@ server { location ~ /\.ht { deny all; } - + location /.well-known/acme-challenge/ { root /var/www/letsencrypt/; log_not_found off; diff --git a/nginx/sites/project-1.conf.example b/nginx/sites/project-1.conf.example index 011213a6..1eb8545c 100644 --- a/nginx/sites/project-1.conf.example +++ b/nginx/sites/project-1.conf.example @@ -4,7 +4,7 @@ server { listen [::]:80; server_name project-1.dev; - root /var/www/project-1/public; + root /var/www/project-1; index index.php index.html index.htm; location / { @@ -15,7 +15,7 @@ server { try_files $uri /index.php =404; fastcgi_pass php-upstream; fastcgi_index index.php; - fastcgi_buffers 16 16k; + fastcgi_buffers 16 16k; fastcgi_buffer_size 32k; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params; @@ -24,7 +24,7 @@ server { location ~ /\.ht { deny all; } - + location /.well-known/acme-challenge/ { root /var/www/letsencrypt/; log_not_found off; diff --git a/nginx/sites/project-2.conf.example b/nginx/sites/project-2.conf.example index 590c1a55..0c37ceec 100644 --- a/nginx/sites/project-2.conf.example +++ b/nginx/sites/project-2.conf.example @@ -4,7 +4,7 @@ server { listen [::]:80; server_name project-2.dev; - root /var/www/project-2/public; + root /var/www/project-2; index index.php index.html index.htm; location / { @@ -15,7 +15,7 @@ server { try_files $uri /index.php =404; fastcgi_pass php-upstream; fastcgi_index index.php; - fastcgi_buffers 16 16k; + fastcgi_buffers 16 16k; fastcgi_buffer_size 32k; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params; @@ -24,7 +24,7 @@ server { location ~ /\.ht { deny all; } - + location /.well-known/acme-challenge/ { root /var/www/letsencrypt/; log_not_found off;