flesh out santiago and apache config a bit

This commit is contained in:
James Vasile 2012-02-19 14:41:40 -05:00
parent c9b09c5de2
commit 992eff9e13
2 changed files with 22 additions and 20 deletions

View File

@ -5,7 +5,7 @@ with information. There is authentication involved, although I
haven't figured that one all the way through yet. haven't figured that one all the way through yet.
""" """
import os import os, sys
import cherrypy import cherrypy
import simplejson as json import simplejson as json
from gettext import gettext as _ from gettext import gettext as _
@ -16,12 +16,12 @@ import util as u
santiago_port = 52854 santiago_port = 52854
import gnupg #import gnupg
def check_sig(query, sig): #def check_sig(query, sig):
"Verify that the sig and the query match" # "Verify that the sig and the query match"
gpg = gnupg.GPG(gnupghome='/home/james/') # gpg = gnupg.GPG(gnupghome='/home/james/')
return True # return True
class Santiago(PagePlugin): class Santiago(PagePlugin):
order = 90 # order of running init in PagePlugins order = 90 # order of running init in PagePlugins

View File

@ -3,6 +3,7 @@
# The DocumentRoot is set by fabric # The DocumentRoot is set by fabric
DocumentRoot /dev/null DocumentRoot /dev/null
ServerName plinth ServerName plinth
ServerAlias plinth.*
## Force ssl ## Force ssl
RewriteEngine on RewriteEngine on
@ -15,6 +16,7 @@
# The DocumentRoot is set by fabric # The DocumentRoot is set by fabric
DocumentRoot /dev/null DocumentRoot /dev/null
ServerName plinth ServerName plinth
ServerAlias plinth.*
SSLEngine on SSLEngine on
SSLCertificateFile /etc/apache2/ssl/apache.pem SSLCertificateFile /etc/apache2/ssl/apache.pem