From 88eaa33feac1710020f6680c9692e69c2985812f Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 19 Sep 2017 18:19:43 +1000
Subject: [PATCH] Update documentation to take into account different apache
conf folder locations
---
docs/tools/buildkit.md | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/docs/tools/buildkit.md b/docs/tools/buildkit.md
index 9304bddc..0181ced9 100644
--- a/docs/tools/buildkit.md
+++ b/docs/tools/buildkit.md
@@ -126,19 +126,23 @@ Buildkit provides a tool called `amp` which [civibuild](/tools/civibuild.md) use
* For Apache 2.2:
- Create a new file `/etc/apache2/conf.d/buildkit.conf` with the following contents:
+ Create a new file `buildkit.conf` with the following contents in either `/etc/apache2/conf.d/` or `/etc/httpd/conf.d` depending on your server configuration.
```
Include <amp-installation>/apache.d/*conf
```
+
+ This [blog](http://commanigy.com/blog/2011/6/8/finding-apache-configuration-file-httpd-conf-location) has some good information on finding the relevant apache conf dir
* For Apache 2.4:
- Create a new file `/etc/apache2/conf.d/buildkit.conf` with the following contents:
+ Create a new file `buildkit.conf` with the following contents in either `/etc/apache2/conf.d/` or `/etc/httpd/conf.d` depending on your server configuration.
```
IncludeOptional <amp-installation>/apache.d/*conf
```
+
+ This [blog](http://commanigy.com/blog/2011/6/8/finding-apache-configuration-file-httpd-conf-location) has some good information on finding the relevant apache conf dir
* For nginx:
--
GitLab