From 74cd4d1d77b546226a459aea30d8ae852aff467e Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Sun, 26 Sep 2010 18:56:35 -0400 Subject: [PATCH] Corrected Apache configuration for new site. --- apache2/sites-available/sfconservancy.org | 30 ++++++++++++++--------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/apache2/sites-available/sfconservancy.org b/apache2/sites-available/sfconservancy.org index b5020828..10dc74cd 100644 --- a/apache2/sites-available/sfconservancy.org +++ b/apache2/sites-available/sfconservancy.org @@ -1,23 +1,31 @@ -NameVirtualHost 10.18.73.204:80 -#NameVirtualHost 10.18.73.204:443 +# Copyright (C) 2005-2009, Software Freedom Law Center, Inc. +# Copyright (C) 2010, Bradley M. Kuhn - - ServerName conservancy.softwarefreedom.org - ServerAdmin root@softwarefreedom.org +# This file is licensed under the ISC license. See the toplevel file +# in this repository, ISC_LICENSE. If you received this file separated +# from its repository, you should be able to find a copy of the license +# at: http://www.isc.org/software/license + +NameVirtualHost 10.10.11.21:80 +#NameVirtualHost 10.10.11.21:443 + + + ServerName sfconservancy.org + ServerAdmin root@sfconservancy.org # SSLCertificateFile /etc/apache2/ssl/apache.pem - DocumentRoot /var/www/external-website/conservancy/static + DocumentRoot /var/www/conservancy/static - + Options -Indexes FollowSymLinks -MultiViews Order allow,deny allow from all AllowOverride None - PythonPath "['/var/www/external-website'] + sys.path" + PythonPath "['/var/www'] + sys.path" SetEnv DJANGO_SETTINGS_MODULE conservancy.settings PythonDebug Off - PythonPostReadRequestHandler sfcwrapper + PythonPostReadRequestHandler wrapper PythonOutputFilter modpythoncustom DJANGOTEMPLATE AddOutputFilter DJANGOTEMPLATE html @@ -27,13 +35,13 @@ NameVirtualHost 10.18.73.204:80 ErrorDocument 404 /404error.html ErrorDocument 500 /500error.html - ErrorLog /var/log/apache2/conservancy.softwarefreedom.org_error.log + ErrorLog /var/log/apache2/sfconservancy.org_error.log # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. LogLevel warn - CustomLog /var/log/apache2/conservancy.softwarefreedom.org_access.log combined + CustomLog /var/log/apache2/sfconservancy.org_access.log combined ServerSignature On