summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/minimaws
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-09-30 20:00:23 +1000
committer Vas Crabb <vas@vastheman.com>2019-09-30 20:00:23 +1000
commit9fbded3fa1bb6ebeec9325c6b0dfac532a8b68e2 (patch)
tree0d2334e729fe65d9950e9062b833c5086e4054b9 /scripts/minimaws
parentcf1f9cc6bb1270559ce808132f610e92393e949b (diff)
minimaws: easier mod_wsgi deployment (nw)
Diffstat (limited to 'scripts/minimaws')
-rw-r--r--scripts/minimaws/lib/wsgiserve.py2
-rwxr-xr-xscripts/minimaws/minimaws.py12
2 files changed, 11 insertions, 3 deletions
diff --git a/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py
index 4c64feb6e76..ae5e8f69dd7 100644
--- a/scripts/minimaws/lib/wsgiserve.py
+++ b/scripts/minimaws/lib/wsgiserve.py
@@ -589,6 +589,8 @@ class MiniMawsApp(object):
def __call__(self, environ, start_response):
application_uri = wsgiref.util.application_uri(environ)
+ if application_uri[-1] != '/':
+ application_uri += '/'
module = wsgiref.util.shift_path_info(environ)
if module == 'machine':
return MachineHandler(self, application_uri, environ, start_response)
diff --git a/scripts/minimaws/minimaws.py b/scripts/minimaws/minimaws.py
index bf28d6d649d..e690fcd818f 100755
--- a/scripts/minimaws/minimaws.py
+++ b/scripts/minimaws/minimaws.py
@@ -78,13 +78,17 @@
## and see dependent slots update. Required command-line arguments to
## produce the selected configuration are also displayed.
+import argparse
+import os
+import os.path
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
import lib.auxverbs
import lib.lxparse
import lib.wsgiserve
-import argparse
-import sys
-
if __name__ == '__main__':
parser = argparse.ArgumentParser()
@@ -135,3 +139,5 @@ if __name__ == '__main__':
lib.wsgiserve.run_server(options)
elif options.command == 'load':
lib.lxparse.load_info(options)
+else:
+ application = lib.wsgiserve.MiniMawsApp(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'minimaws.sqlite3'))