aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-07-16 14:27:29 +0100
committerGareth Rees <gareth@mysociety.org>2014-07-16 14:27:29 +0100
commit1a2c839f032a9776a3f39da2cb207a1b0c762f5a (patch)
tree734531a02952b604078b38af282a7cad1d0cb09e
parent134d9934178b00dad6c1bc9a8295a6b384a6ca13 (diff)
fixup! 134d993 Use /srv/alaveteli instead of SITE_URL
-rw-r--r--config/httpd-vhost.conf-example16
1 files changed, 8 insertions, 8 deletions
diff --git a/config/httpd-vhost.conf-example b/config/httpd-vhost.conf-example
index fbdc2db23..d0ca7c2b1 100644
--- a/config/httpd-vhost.conf-example
+++ b/config/httpd-vhost.conf-example
@@ -10,7 +10,7 @@
<VirtualHost *:80>
ServerName www.example.com
ServerAdmin webmaster@example.com
- DocumentRoot /srv/www.example.com/
+ DocumentRoot /srv/alaveteli/
# TODO: Remove this and use PassengerUser
SuExecUserGroup foi foi
@@ -35,7 +35,7 @@
</IfModule>
# This is your Rails app's public directory
- <Directory "/srv/www.example.com/">
+ <Directory "/srv/alaveteli/">
Options +ExecCGI -MultiViews
AllowOverride All
AddHandler fastcgi-script .cgi
@@ -92,20 +92,20 @@
<IfModule mod_xsendfile.c>
RequestHeader Set X-Sendfile-Type X-Sendfile
XSendFile On
- XSendFilePath /srv/www.example.com
+ XSendFilePath /srv/alaveteli
</IfModule>
</Location>
# Commonlib is typically found in alaveteli/commonlib
- Alias /jslib/ "/srv/www.example.com/jslib"
- <Directory "/srv/www.example.com/commonlib/jslib">
+ Alias /jslib/ "/srv/alaveteli/jslib"
+ <Directory "/srv/alaveteli/commonlib/jslib">
Options +ExecCGI
AddHandler fastcgi-script .cgi
AddType application/x-httpd-fastphp .php
Action application/x-httpd-fastphp /fcgi/php-basic
</Directory>
- Alias /files/ "/srv/www.example.com/files/"
+ Alias /files/ "/srv/alaveteli/files/"
# Serve attachments directly from the cache, if possible.
#
@@ -154,8 +154,8 @@
# as mod_alias doesn't work with Passenger.
<VirtualHost *:80>
ServerName files.example.com
- DocumentRoot /srv/files.example.com/files
- <Directory "/srv/files.example.com/files">
+ DocumentRoot /srv/alaveteli-files/files
+ <Directory "/srv/alaveteli-files/files">
Options +Indexes
</Directory>
</VirtualHost>