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
Use contact address from config on error page
[invirt/packages/invirt-web.git]
/
code
/
main.fcgi
diff --git
a/code/main.fcgi
b/code/main.fcgi
index
6d5543e
..
6f3ed99
100755
(executable)
--- a/
code/main.fcgi
+++ b/
code/main.fcgi
@@
-4,7
+4,7
@@
import cherrypy
import os
import sys
import cherrypy
import os
import sys
-from main import InvirtWeb
+from main import InvirtWeb, InvirtUnauthWeb
dev = False
base_dir = os.path.dirname(__file__)
dev = False
base_dir = os.path.dirname(__file__)
@@
-18,12
+18,17
@@
if __name__=="__main__":
else:
conf_file = os.path.join(base_dir, 'main.conf')
app = cherrypy.tree.mount(InvirtWeb(),
else:
conf_file = os.path.join(base_dir, 'main.conf')
app = cherrypy.tree.mount(InvirtWeb(),
- '/' if dev else '/main.fcgi',
- {'/': {'tools.staticdir.root': static_dir},
+ '/',
+ {'/': {'tools.staticdir.root': static_dir,
+ 'tools.invirtwebstate.on': True},
'/static': {'tools.staticdir.on': True,
'tools.staticdir.dir': static_dir}
})
app.merge(conf_file)
'/static': {'tools.staticdir.on': True,
'tools.staticdir.dir': static_dir}
})
app.merge(conf_file)
+ unauthApp = cherrypy.tree.mount(InvirtUnauthWeb(),
+ '/unauth',
+ {'/': {'tools.invirtwebstate.on': True}})
+ unauthApp.merge(conf_file)
cherrypy.config.update(conf_file)
if dev:
cherrypy.config.update(conf_file)
if dev:
@@
-33,5
+38,5
@@
if __name__=="__main__":
else:
cherrypy.engine.start(blocking=False)
from flup.server.fcgi import WSGIServer
else:
cherrypy.engine.start(blocking=False)
from flup.server.fcgi import WSGIServer
- server = WSGIServer(app)
+ server = WSGIServer(cherrypy.tree)
server.run()
server.run()