projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added service message to https, modified cert line
[invirt/packages/invirt-web.git]
/
code
/
main.py
diff --git
a/code/main.py
b/code/main.py
index
9f57f84
..
7044167
100755
(executable)
--- a/
code/main.py
+++ b/
code/main.py
@@
-51,11
+51,7
@@
class InvirtUnauthWeb(View):
@cherrypy.expose
@cherrypy.tools.mako(filename="/unauth.mako")
def index(self):
@cherrypy.expose
@cherrypy.tools.mako(filename="/unauth.mako")
def index(self):
- d = dict(simple=True)
- if os.path.exists("/etc/invirt/message"):
- f = open('/etc/invirt/message')
- d['serviceMessage']= f.read()
- return d
+ return dict(simple=True)
class InvirtWeb(View):
def __init__(self):
class InvirtWeb(View):
def __init__(self):
@@
-524,9
+520,9
@@
def modifyDict(username, state, machine_id, fields):
olddisk = {}
session.begin()
try:
olddisk = {}
session.begin()
try:
- kws = dict([(kw, fields[kw]) for kw in
+ kws = dict((kw, fields[kw]) for kw in
'owner admin contact name description memory vmtype disksize'.split()
'owner admin contact name description memory vmtype disksize'.split()
- if fields[kw]])
+ if fields.get(kw))
kws['machine_id'] = machine_id
validate = validation.Validate(username, state, **kws)
machine = validate.machine
kws['machine_id'] = machine_id
validate = validation.Validate(username, state, **kws)
machine = validate.machine