From d1d5554d8b563786e74f25e13e82632f95988fbf Mon Sep 17 00:00:00 2001 From: Tim Otten <totten@civicrm.org> Date: Sun, 8 Oct 2017 00:43:35 +0100 Subject: [PATCH] toosl/buildkit.md - Don't talk so much about nginx As noted earlier in the doc: "We strongly recommend using Apache as your webserver because support for nginx is limited." So... it doesn't make much sense to give broken/incomplete instructions for something we say you shouldn't do. :) --- docs/tools/buildkit.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/tools/buildkit.md b/docs/tools/buildkit.md index 97372035..e4afcf4c 100644 --- a/docs/tools/buildkit.md +++ b/docs/tools/buildkit.md @@ -124,7 +124,7 @@ Buildkit provides a tool called `amp` which [civibuild](/tools/civibuild.md) use 1. Identify the location of your `amp` installation. It is probably a `.amp` folder within your home directory. Make sure to *use the full path* to this directory in the settings below. We will use `<amp-installation>` henceforth to refer to the full path of this directory. - 1. Go to your webserver's system-wide configuration files. For Apache, this is usually `/etc/apache2`, but on some systems it might be `/etc/httpd/` or similar. (Check this [blog](http://commanigy.com/blog/2011/6/8/finding-apache-configuration-file-httpd-conf-location) for more info on finding your Apache configuration.) For nginx, the directory is usually `/etc/nginx`. + 1. Go to your webserver's system-wide configuration files. For Apache, this is usually `/etc/apache2`, but on some systems it might be `/etc/httpd/` or similar. (Check this [blog](http://commanigy.com/blog/2011/6/8/finding-apache-configuration-file-httpd-conf-location) for more info on finding your Apache configuration.) 1. Inside this directory, create a new directory called `conf.d`, if not already present. @@ -147,12 +147,6 @@ Buildkit provides a tool called `amp` which [civibuild](/tools/civibuild.md) use ``` IncludeOptional <amp-installation>/apache.d/*conf ``` - - * For nginx, use this content: - - ``` - include <amp-installation>/nginx.d/*.conf; - ``` 1. Restart your webserver. -- GitLab