From d65ed753d9cd81c2dae8c33b5a85bd28c5b9e7d2 Mon Sep 17 00:00:00 2001
From: checktheroads <mtt.lov@gmail.com>
Date: Mon, 13 May 2019 21:58:48 -0700
Subject: [PATCH] merging fixes from text linux box

---
 .flask_cache/1842a0ff0c5b4bdbdca506a3489cceed | Bin 2848 -> 0 bytes
 .flask_cache/2029240f6d1128be89ddc32729463129 | Bin 8 -> 0 bytes
 .flask_cache/2a6f99d4936620a3f0bd95fedf526b2f | Bin 57 -> 0 bytes
 .flask_cache/4d39e19ce3b3acf5580716fe63ee17a6 | Bin 59 -> 0 bytes
 .flask_cache/74bc75c0764cbc805c70645cef1f026b | Bin 241 -> 0 bytes
 .flask_cache/7ccf01c622d424f11a8e98761770e19a | Bin 241 -> 0 bytes
 .flask_cache/8e5cc37f0d5eb521574b7675b78fbb7a | Bin 53 -> 0 bytes
 .flask_cache/95b12f8cd6b93bf78161ab0764ef7d66 | Bin 54 -> 0 bytes
 .flask_cache/aabe6e7d021b7037492975340fe21c03 | Bin 54 -> 0 bytes
 .flask_cache/bfec0932dad185d106f4b86af0f7c734 | Bin 56 -> 0 bytes
 .flask_cache/c59a0149864f3a0ccffa8e150c81bc43 | Bin 241 -> 0 bytes
 .flask_cache/d277c4e120e0e4b7fa8f80455a32af2e | Bin 52 -> 0 bytes
 .flask_cache/dd6eca7ee6b5f09a8f1821c6c4a5510b | Bin 108 -> 0 bytes
 .flask_cache/e6ed342200608fc2907bdfc4b3dfe59d | Bin 56 -> 0 bytes
 .flask_cache/f9a2505762c137a92600cf2ad6c0527d | Bin 241 -> 0 bytes
 docs/installation/wsgi.md                     |  36 ++++++++++++++++++
 hyperglass/hyperglass.py                      |   1 +
 hyperglass/static/js/hyperglass.js            |   5 +--
 18 files changed, 38 insertions(+), 4 deletions(-)
 delete mode 100644 .flask_cache/1842a0ff0c5b4bdbdca506a3489cceed
 delete mode 100644 .flask_cache/2029240f6d1128be89ddc32729463129
 delete mode 100644 .flask_cache/2a6f99d4936620a3f0bd95fedf526b2f
 delete mode 100644 .flask_cache/4d39e19ce3b3acf5580716fe63ee17a6
 delete mode 100644 .flask_cache/74bc75c0764cbc805c70645cef1f026b
 delete mode 100644 .flask_cache/7ccf01c622d424f11a8e98761770e19a
 delete mode 100644 .flask_cache/8e5cc37f0d5eb521574b7675b78fbb7a
 delete mode 100644 .flask_cache/95b12f8cd6b93bf78161ab0764ef7d66
 delete mode 100644 .flask_cache/aabe6e7d021b7037492975340fe21c03
 delete mode 100644 .flask_cache/bfec0932dad185d106f4b86af0f7c734
 delete mode 100644 .flask_cache/c59a0149864f3a0ccffa8e150c81bc43
 delete mode 100644 .flask_cache/d277c4e120e0e4b7fa8f80455a32af2e
 delete mode 100644 .flask_cache/dd6eca7ee6b5f09a8f1821c6c4a5510b
 delete mode 100644 .flask_cache/e6ed342200608fc2907bdfc4b3dfe59d
 delete mode 100644 .flask_cache/f9a2505762c137a92600cf2ad6c0527d

diff --git a/.flask_cache/1842a0ff0c5b4bdbdca506a3489cceed b/.flask_cache/1842a0ff0c5b4bdbdca506a3489cceed
deleted file mode 100644
index e1078ec83956f4dbf7127668ad9aa417a298a093..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2848
zcmcguJCf5t5G5d>Ou!Yoio{zb5A&0}QpOT&L4rd964@HdQ>7o$*o!j`0jJ<Z+=kW<
zOSbWE*DIIhR?qZ|`t^G~{`BqlpReS{%U^F^zo@P+uh1CnTu?012bhK#=xilnndq5c
z7+|FQ(05z{z)sL;aCbj}JY5={gkbz>q(CJmU&B1jJFyn5R9@&b0YRn9$Bt74-l@W5
zzFBw>D5LUNC%Q0tHi}g+n4rJ#V8|%=D_=+D+7?VP0^SO%*(*?Ue;JvZ0l@nJw=lX;
z0hkn)S>PKr3h~vl!oy*_SamON`0TjC1tx^BEg1S?n5z&20+_CAFEELTQ%1&|uyTEj
zcU>YRaXE2d7%P+O8Q_c?nCEHSAMH%7V*x(rI@Ae#yq{Rm1XBy5bmm7{uI9KBK0YWN
zE)ew6Uipy@EYJxellW1c1AIv17;9tJ9=@T?ZI3p;jB?hP{8qMJL8)lGa%0-KLE}Y}
zpA82>maCc4D;12=Bw9ZkKF^8?<L(iPILHnAmM}?Mj+7o|6E;Tjpkyj$Z25+qaNEYO
zBzD8B^Vq>V>`>opcGSwam?JH7kRz?x=ZL_i&%|RtNw&ba2%s&|G^A*u*aHF<(i1kN
zw9H~G59@xns2er&gTlwr&eThU-!1K<h2K{4zeQzd!?C}nousdY&r=Ei3Yb)U6HOPu
zLxbD3?E9`EL%nl{IE1<KvD7#~_0!ITE5NXy8hsEdwf9}8;=(E4JuZ(ce=I$YhaKiy
zTAZ?~ksWIR6sw7CfD5<n>l=#S{-ZdqwsZF5XlLprb!Hs@kvtXMvDH<C=r{9|bl<~Z
Qe{nmRUJI0K1M!pm1u@aVPyhe`

diff --git a/.flask_cache/2029240f6d1128be89ddc32729463129 b/.flask_cache/2029240f6d1128be89ddc32729463129
deleted file mode 100644
index 61c5ec062ffb260f43887c58eeb884d2edbc5ed6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
PcmeZf&}(4v=F<ZJ2QLAI

diff --git a/.flask_cache/2a6f99d4936620a3f0bd95fedf526b2f b/.flask_cache/2a6f99d4936620a3f0bd95fedf526b2f
deleted file mode 100644
index ccb499d88729c6bb75c0b52421bd623a9724b715..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 57
zcmea$S$Z=@uYqN%1_K22sHCT*6c?wYrIssX7AxfCmnbAElqKe5rYLv@C^)916r~my
I>rK%E0PZRg+5i9m

diff --git a/.flask_cache/4d39e19ce3b3acf5580716fe63ee17a6 b/.flask_cache/4d39e19ce3b3acf5580716fe63ee17a6
deleted file mode 100644
index 912d89aec14d9f8e2ac56293059fa5c09a368b90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59
zcmeYgUUD-=uYqN%76SzIsO4m56{n;D$+RMc%wmPS{1Sykg|ft)%oGLB00qaCl%mw)
IV!bJP028MYo&W#<

diff --git a/.flask_cache/74bc75c0764cbc805c70645cef1f026b b/.flask_cache/74bc75c0764cbc805c70645cef1f026b
deleted file mode 100644
index e58b6a89f173ec43cfc713bb4f075d71e807c68d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmXAiJx&8L5JoAe_7q<_kT!O_WQ#>g6;T8UDN-nD9D9;jXzj&6KspXU376nTNE94}
zS@KOW8qLgmx9;ovLA;%R{+^xk{&RmE2$YQGmguRFH-sFZw;^UxZOB{a_h@UV*=)K!
zX2NQDx5kY*gft#1@n1Ev>nW5Bm(VcE1aH%Iwbtg5GS5Ea#pMGuQYeun+S*7dA?%>K
zPF&4J*9e7bGN#%TW5#XNY-A+cF%bVT=c1MEWsMk$x6>TmfZlnjpZBuYuUJ4yB^&hV
GL;L}cbW4N)

diff --git a/.flask_cache/7ccf01c622d424f11a8e98761770e19a b/.flask_cache/7ccf01c622d424f11a8e98761770e19a
deleted file mode 100644
index b3b7d353b9ef174be1ca1b0c57fdc88f883c10a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmXAiy-EW?6om~~?Nb~(h0UF8+=bnMRj^P91Y&73nYkuI*qL>H)O2|OORan|!NNyz
z7Eg1zoO{3Te)9GGNT>79-?RU`|2!NA1_vec2>hJbDn@jWTjwJc8@Afm9hwr=Y&P8<
zBjawlTH{vjT^J8rYN@8WL^M6S6k!798Ks=nVNtB5I&jRpjd(S24~gKC&l0J%=MdnY
zP<0($*VN6aLUA#s*d(RK*2`?n$ZW^J`7d)W8_`^q@Ge<Bjou9CjTQ1`CwlpY8?>So
I9s2M=e=M_0HUIzs

diff --git a/.flask_cache/8e5cc37f0d5eb521574b7675b78fbb7a b/.flask_cache/8e5cc37f0d5eb521574b7675b78fbb7a
deleted file mode 100644
index 807e1c1ac14bf6346e0b2f1c8b34a99f0d7596b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 53
zcmebJw)kd@UIWWi6$S|CQAkNkN=s45ELO<NFHuNTC`-)AOi}O*P;g91DM~Fa)|;XS
E0K=#d(*OVf

diff --git a/.flask_cache/95b12f8cd6b93bf78161ab0764ef7d66 b/.flask_cache/95b12f8cd6b93bf78161ab0764ef7d66
deleted file mode 100644
index 64f06eddcb61bda02894d5afa5daf467160b1db1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54
zcmeZzy5wezUIWWiRR##?QA|%uNlPzM$ShXK%P&z#R47Z#$xKo33{Y@PNhwM#F4mi(
F2LRSG5kCL`

diff --git a/.flask_cache/aabe6e7d021b7037492975340fe21c03 b/.flask_cache/aabe6e7d021b7037492975340fe21c03
deleted file mode 100644
index 8243355d33ca2c753b311ee7ca71df748041f8a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54
zcmeZzzv^a;UIWWiRR##?QA{gNEKW&N$ShXK%P&z#R47Z#$xKo33{Y@PNhwM#F4mi(
F2LRfO5mo>I

diff --git a/.flask_cache/bfec0932dad185d106f4b86af0f7c734 b/.flask_cache/bfec0932dad185d106f4b86af0f7c734
deleted file mode 100644
index 65d071d9301a14d665537b1242bfa2ffd0e06638..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 56
zcmeZTxa4MxUIWWibp{CNQBF%qDNZa-NmIxyR>;dQQAkuMOU%hkQSb~<a7;-lN-Zwd
Ho1zB*@EZ}%

diff --git a/.flask_cache/c59a0149864f3a0ccffa8e150c81bc43 b/.flask_cache/c59a0149864f3a0ccffa8e150c81bc43
deleted file mode 100644
index 8d391880627b39302941aa032be73478098119b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmXAiu}TCn5QZ(R_9=clg}vnVbYWMp5(@?4;4E!&$#@rJlQo&B*ZBaJ+WBIFh4>`S
z>OaLW%*^*){d|1hs+axu@4f%Le%<Uw0%dEYWqK$SEP*4;Iwn@tih}cDgSJL9pU>7i
zCS0ChFL7bFF;9n``l}l32a1K^GZuofF}QqMEseb=mN_t<Ja1u;V@V=0&Lzqj@eWPj
ztK$>ZFI0o-U`n+r)=t}G#3)FyV<h<#&S9(DqZ%oe;AWish`|SK9yfY0&p1P;JKbZ*
GZ|WBXVN4(Z

diff --git a/.flask_cache/d277c4e120e0e4b7fa8f80455a32af2e b/.flask_cache/d277c4e120e0e4b7fa8f80455a32af2e
deleted file mode 100644
index 30c8d042f669981dfaf8696d2a73e64a713089d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 52
zcmea8vFc`wUIWWiWd;c7kxwj6NmIxyR>;dQQAkuMOU%hkQSb~<a7;-lN-Zwdo1zB*
Dp#Tsf

diff --git a/.flask_cache/dd6eca7ee6b5f09a8f1821c6c4a5510b b/.flask_cache/dd6eca7ee6b5f09a8f1821c6c4a5510b
deleted file mode 100644
index 5cb2d5e7dd3d4530c1cdcc879a69d17460569960..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 108
zcmeYYT5&T*uYqN1Gy??mNV^sl<rgU==jY|6CYNO9r7M)=E2N~BWhSTUP4S)2SUW|d
zhpi~Tv?R4?N)KyJVzGhYlpf~f+>|LjECoR2Q+hZu3kr%-(=scj^spQ1f#H<W_9=P*
D)lnu0

diff --git a/.flask_cache/e6ed342200608fc2907bdfc4b3dfe59d b/.flask_cache/e6ed342200608fc2907bdfc4b3dfe59d
deleted file mode 100644
index 56babdf1799510e66c91ff8e175c3b60c1dccdf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 56
zcmebJx$0(&UIWWibp{CNQO?QEDo#mDPglq+R>;dQQAkuMOU%hkQSb~<a7;-lN-Zwd
Ho1zB*20#)y

diff --git a/.flask_cache/f9a2505762c137a92600cf2ad6c0527d b/.flask_cache/f9a2505762c137a92600cf2ad6c0527d
deleted file mode 100644
index 9a5ce0a2eaca04cb67d62162f0d8a0a2e0eea1fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmXAiu}%Xq5JV}c?kk24q>JwyxZ;pfMHC<*MG7U2V=sw?&OW?0kdA_q5;}eiiGojI
zPnjuJquqUT^ZxyFuilQo{*Dg%_`TbY1Y&DsFg+CtmXIUNCZ?>aH3jFx7F`Y9wzJJX
z6RwxHD_q%K<mphWR;+7eKTs?go-r4cjluC{wKDdRvgDBQ;`0s$97~cC<6I(U#0TiU
zSLYY1pDT^(WKy**)=t}Gq*0L4j*;X~IHz6Hoz+OO1UJjcj~IMt%=5Mx%qteqjTi%e
Fs(+ezOO5~l

diff --git a/docs/installation/wsgi.md b/docs/installation/wsgi.md
index c4264b1..890b763 100644
--- a/docs/installation/wsgi.md
+++ b/docs/installation/wsgi.md
@@ -12,3 +12,39 @@ Gunicorn is a WSGI server written in Python.
 ## Configure
 
 Locate your `gunicorn` executable with `which gunicorn`.
+
+### Permissions
+
+Gunicorn requires read/write/executable access to the entire `hyperglass/hyperglass` directory in order to read its configuration and execute the python code. If running gunicorn as www-data, fix permissions with:
+
+```console
+# chown -R www-data:www-data /opt/hyperglass/hyperglass
+# chmod -R 744 /opt/hyperglass/hyperglass
+```
+
+<!-- # Supervisor Installation
+
+To make cross-platform service functionality easier, it is recommended to use [`supervisord`](http://supervisord.org/) to manage the Hyperglass application. If you prefer, `systemd` or your service manager of choice may be used.
+
+Install supervisord:
+
+```console
+# apt install -y supervisor
+```
+
+Create supervisord configuration for Hyperglass:
+
+```console
+# nano /etc/supervisor/conf.d/hyperglass.conf
+[program:hyperglass]
+command = /usr/local/bin/gunicorn -c /opt/hyperglass/hyperglass/gunicorn_config.py hyperglass.wsgi
+directory = /opt/hyperglass/
+user = www-data
+```
+
+Start supervisord:
+
+```console
+# systemctl start supervisor
+# systemctl status supervisor
+``` -->
diff --git a/hyperglass/hyperglass.py b/hyperglass/hyperglass.py
index 9734e00..ce5caf9 100644
--- a/hyperglass/hyperglass.py
+++ b/hyperglass/hyperglass.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 # Module Imports
+import os
 import sys
 import json
 import toml
diff --git a/hyperglass/static/js/hyperglass.js b/hyperglass/static/js/hyperglass.js
index d390c8b..cb5efdf 100644
--- a/hyperglass/static/js/hyperglass.js
+++ b/hyperglass/static/js/hyperglass.js
@@ -189,27 +189,24 @@ var submitForm = function() {
     type: 'POST',
     data: JSON.stringify({router: router, cmd: cmd, ipprefix: ipprefix}),
     contentType: "application/json; charset=utf-8",
+    context: document.body,
     readyState: resultsbox.show() && progress.show(),
     statusCode: {
       200: function(response, code) {
-        console.log(code, response);
         progress.hide();
         $('#output').html(`<br><div class="content"><p class="query-output" id="output">${response}</p></div>`);
       },
       405: function(response, code) {
-        console.log(code, response);
         progress.hide();
         $('#ipprefix').addClass('is-warning');
         $('#output').html(`<br><div class="notification is-warning" id="output">${response.responseText}</div>`);
       },
       415: function(response, code) {
-        console.log(code, response);
         progress.hide();
         $('#ipprefix').addClass('is-danger');
         $('#output').html(`<br><div class="notification is-danger" id="output">${response.responseText}</div>`);
       },
       429: function(response, code) {
-        console.log(code, response);
         progress.hide();
         $("#ratelimit").addClass("is-active");
       }