From 6a7e9be30cd351ec2e346ed53258736d42faa811 Mon Sep 17 00:00:00 2001
From: wes <wjak56@gmail.com>
Date: Thu, 23 Jun 2016 22:06:51 -0400
Subject: [PATCH] update makefile and ini file for uwsgi

---
 Makefile               |  5 +++++
 search.ini             | 15 +++++++++++++++
 src/scripts/search.js  |  2 +-
 src/scripts/search.tag |  2 +-
 src/website.py         |  7 ++++---
 5 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100755 search.ini

diff --git a/Makefile b/Makefile
index 63b504b..900f8f4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,3 +14,8 @@ default:
 
 clean:
 	rm -r ./build;
+
+install:
+	$(MAKE) clean;
+	$(MAKE);
+	cp -r ./build /srv/http/build;
diff --git a/search.ini b/search.ini
new file mode 100755
index 0000000..89b8887
--- /dev/null
+++ b/search.ini
@@ -0,0 +1,15 @@
+[uwsgi]
+wsgi_file = /srv/http/build/website.py
+module = website
+callable = app
+uid = http
+gid = http
+
+master = true
+processes = 5
+
+socket = /tmp/search.sock
+chown-socket = http:http
+chmod-socket = 660
+vacuum = true
+die-on-term  = true
diff --git a/src/scripts/search.js b/src/scripts/search.js
index f33d2a0..8fe25b4 100644
--- a/src/scripts/search.js
+++ b/src/scripts/search.js
@@ -7,7 +7,7 @@ function makeResourceGetter(self) {
             "title" : this.booktitle,
             "author" : this.bookauthor
         };
-        var url = "/resources";
+        var url = "/search/resources";
         console.log(params);
         $.getJSON(url, {
             data : JSON.stringify(params)
diff --git a/src/scripts/search.tag b/src/scripts/search.tag
index ba364bd..c7b0804 100644
--- a/src/scripts/search.tag
+++ b/src/scripts/search.tag
@@ -21,7 +21,7 @@
 function submit(ev) {
     console.log("submitted");
     var params = $(ev.currentTarget).serialize();
-    $.getJSON("/fc?"+params,
+    $.getJSON("/search/fc?"+params,
         function(courses) {
             var fcourses = filterCourses(courses);
             var cgroups = groupsof(4, fcourses);
diff --git a/src/website.py b/src/website.py
index 981f46f..566567a 100755
--- a/src/website.py
+++ b/src/website.py
@@ -85,7 +85,6 @@ def ClassSearch(configfile=None):
 
     @blueprint.route("/", methods=("GET", "POST"))
     def index():
-        print "never reached?"
         return render_template("search.html")
 
     @blueprint.route("/fc", methods=("GET", "POST"))
@@ -144,5 +143,7 @@ def ClassSearch(configfile=None):
     app.config["styles"] = "./styles"
     return app
 
-if __name__ == "__main__":
-    ClassSearch("./appconfig").run(host="localhost", port=8001, debug=True)
+app = ClassSearch("./appconfig")
+
+#if __name__ == "__main__":
+    #ClassSearch("./appconfig").run(host="localhost", port=8001, debug=True)