nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

flesh out santiago and apache config a bit

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/installed/santiago/santiago.py
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,22 +16,22 @@ 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
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.register_page("santiago") self.register_page("santiago")
self.santiago_address = self.get_santiago_address() #TODO: multiple santiago ports self.santiago_address = self.get_santiago_address() #TODO: multiple santiago ports
#set a listener on the santiago address #set a listener on the santiago address
def get_santiago_address(self): def get_santiago_address(self):
if 'santiago' in cfg.users['admin'] and 'address' in cfg.users['admin']['santiago']: if 'santiago' in cfg.users['admin'] and 'address' in cfg.users['admin']['santiago']:
return cfg.users['admin']['santiago']['address'] return cfg.users['admin']['santiago']['address']
else: else:
@ -55,11 +55,11 @@ class Santiago(PagePlugin):
print "Need to add these two lines to /etc/torrc:\n%s" % hidden_service_config print "Need to add these two lines to /etc/torrc:\n%s" % hidden_service_config
return "" return ""
def check_for_hidden_service(self): def check_for_hidden_service(self):
pass pass
@cherrypy.expose @cherrypy.expose
def index(self, *args, **kw): def index(self, *args, **kw):
""" """
A request is a dict with some required keys: A request is a dict with some required keys:
@ -112,12 +112,12 @@ class Santiago(PagePlugin):
## Plinth page to config santiago ## Plinth page to config santiago
class santiago(PagePlugin): class santiago(PagePlugin):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
PagePlugin.__init__(self, *args, **kwargs) PagePlugin.__init__(self, *args, **kwargs)
self.menu = cfg.html_root.privacy.menu.add_item("Santiago", "/privacy/santiago", 10) self.menu = cfg.html_root.privacy.menu.add_item("Santiago", "/privacy/santiago", 10)
self.register_page("privacy.santiago") self.register_page("privacy.santiago")
@cherrypy.expose @cherrypy.expose
@require() @require()
def index(self): def index(self):
return "Santiago's config goes here." return "Santiago's config goes here."

2
share/apache2/plinth.conf
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