Files @ f1575ece1a6b
Branch filter:

Location: website/www/conservancy_ssl_wrapper.py

bkuhn
Merge in various HTML fixes from Martin Michlmayr <tbm@cyrius.com> on 2013-02-21.

This did not fast-forward merge because I'd made changes to those files since
Martin submitted his merge request. This merge brings in the changes
contributed in the following two commits from Martin:

commit 8b54927bb51833156a75354090c6ff7dd8794bc8
Author: Martin Michlmayr <tbm@cyrius.com>
Date: 2013-02-21 21:47:15 +0000

Remove stray character

commit 660c48a528baf4e09bb7cc3ccd30afd7bf46072d
Author: Martin Michlmayr <tbm@cyrius.com>
Date: 2013-02-21 21:46:40 +0000

Fix various HTML syntax errors
# Copyright 2005-2008, James Garrison
# Copyright 2010, Bradley M. Kuhn

# This software's license gives you freedom; you can copy, convey,
# propagate, redistribute, modify and/or redistribute modified versions of
# this program under the terms of the GNU Affero General Public License
# (AGPL) as published by the Free Software Foundation (FSF), either
# version 3 of the License, or (at your option) any later version of the
# AGPL published by the FSF.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
# General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program in a file in the toplevel directory called
# "AGPLv3".  If not, see <http://www.gnu.org/licenses/>.

# req.subprocess_env is not set when the PostReadRequestHandler runs,
# so we just bypass it altogether and set the relevant variable here.
# See deployment documentation for more info.
from os import environ
environ["DJANGO_SETTINGS_MODULE"] = 'conservancy_ssl.settings'
environ["CANONICAL_HOSTNAME"] = 'sfconservancy.org'

from modpythoncustom import *