From 64073d4c7efb2f21f66d0fea5083c659a1b0a15e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Smodi=C5=A1?= <aless@guru.si>
Date: Tue, 15 Sep 2015 10:46:10 +0200
Subject: Augmented the readme with apache directives for proxying websocket
 directives.

---
 readme.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'readme.md')

diff --git a/readme.md b/readme.md
index f52a663..d575149 100644
--- a/readme.md
+++ b/readme.md
@@ -16,6 +16,12 @@ Settings:
 
   - point webroot to codeq-web
   - set up reverse proxy for /ws/ to the node server:
+    - using the command a2enmod enable apache modules: proxy, proxy_http, proxy_wstunnel, rewrite
+    - add to the apache configuration the following directives:
+      RewriteEngine on
+      RewriteCond %{REQUEST_URI} ^/ws/ [NC]
+      RewriteCond %{QUERY_STRING} transport=websocket [NC]
+      RewriteRule /(.*) ws://localhost:8083/$1 [P,L]
       ProxyPass /ws/ http://localhost:8083/ws/
       ProxyPassReverse /ws/ http://localhost:8083/ws/
   - set _path_prefix in server.problems
-- 
cgit v1.2.1


From cc3a807157d6d2d2c4830afcec90d6614e486b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Smodi=C5=A1?= <aless@guru.si>
Date: Tue, 15 Sep 2015 11:07:16 +0200
Subject: Removed WSGI parts. They've been supplanted with the node app and the
 TCP communication with the node app.

---
 readme.md | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'readme.md')

diff --git a/readme.md b/readme.md
index d575149..a7e11ca 100644
--- a/readme.md
+++ b/readme.md
@@ -1,15 +1,29 @@
 Deployment
 ==========
 
+To use the correct SWI prolog package (>= 7.2) on Debian, add a custom
+repository by creating the file /etc/apt/sources.list.d/prolog.list
+containing the following 2 lines:
+
+deb http://ppa.launchpad.net/swi-prolog/stable/ubuntu trusty main
+deb-src http://ppa.launchpad.net/swi-prolog/stable/ubuntu trusty main
+
+After that run the following sequence of shell statements to update
+the package cache, register the new repository's key, and again refresh
+the package cache using the additional key:
+
+apt-get update
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EF8406856DBFCA18
+apt-get update
+
 Install the following packages:
 
   - apache2
-  - python3-falcon
+  - python3 (>= 3.4)
   - python3-ply
   - python3-psycopg2
   - python3-termcolor
-  - python3-waitress
-  - swi-prolog-nox
+  - swi-prolog-nox (>= 7.2)
   - nodejs (>= 10.0.22)
 
 Settings:
@@ -31,10 +45,10 @@ Settings:
 
 Running:
 
-  - run prolog/runner/main.pl
-  - run python/runner/main.py
-  - run daemon.py
-  - start the node process (node web/main.js)
+  - run the prolog interpreter server: swipl prolog/runner/main.pl
+  - run the python interpreter server: python3 python/runner/main.py
+  - run the session daemon: python3 daemon.py
+  - run the web server for client communication: node web/main.js
 
 Misc.
 =====
-- 
cgit v1.2.1