diff options
| author | Mark Longair <mhl@pobox.com> | 2013-04-08 15:59:44 +0100 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-04-08 16:07:02 +0100 |
| commit | f1f18afecd819e27cd7a29e1b4bce68fa86c8577 (patch) | |
| tree | 5ebeef2c6510f8edcf7232e0cfa87bfa4be2d48f | |
| parent | cc3da49bc927175a49d7150b98d762f65e143d21 (diff) | |
Rename httpd.conf to httpd.conf-example
The httpd.conf file needs to be customized before being
deployed, and in mySociety's deploy system, a custom version
is only looked for if a corresponding -example file exists.
Also change httpd.conf to httpd.conf-example in INSTALL.md
| -rw-r--r-- | config/httpd.conf-example (renamed from config/httpd.conf) | 0 | ||||
| -rw-r--r-- | doc/INSTALL.md | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/httpd.conf b/config/httpd.conf-example index e468a1e96..e468a1e96 100644 --- a/config/httpd.conf +++ b/config/httpd.conf-example diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 37bcec0b6..278aee370 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -359,8 +359,8 @@ It is not recommended to run the website using the default Rails web server. There are various recommendations here: http://rubyonrails.org/deploy -We usually use Passenger / mod_rails. The file at `conf/httpd.conf` -contains the WhatDoTheyKnow settings. At a minimum, you should +We usually use Passenger / mod_rails. The file at `conf/httpd.conf-example` +gives you an example config file for WhatDoTheyKnow. At a minimum, you should include the following in an Apache configuration file: PassengerResolveSymlinksInDocumentRoot on |