summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2017-04-21 20:37:16 -0400
committerJules Laplace <jules@okfoc.us>2017-04-21 20:37:16 -0400
commit8186aed92fd4ebd01bb12bfaea7cdf8c623e1afd (patch)
tree539742984d0e40ba84b964c0e0207af562022ff4
parentc8500fcc2e0d32f6a5a5bb303d810f5366fc332a (diff)
parentdbd0b98f4ab88aa0cf5fa99492c9c93d8da2962e (diff)
Merge branch 'master' of ghghgh.us:msana
-rw-r--r--msana.giraffe.life19
-rw-r--r--package.json1
2 files changed, 20 insertions, 0 deletions
diff --git a/msana.giraffe.life b/msana.giraffe.life
new file mode 100644
index 0000000..9b51245
--- /dev/null
+++ b/msana.giraffe.life
@@ -0,0 +1,19 @@
+
+upstream msana {
+ server 127.0.0.1:35700;
+}
+
+server {
+ listen 80;
+ server_name msana.giraffe.life;
+ client_max_body_size 50M;
+
+ location / {
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-NginX-Proxy true;
+ proxy_pass http://msana;
+ proxy_redirect off;
+ }
+}
diff --git a/package.json b/package.json
index 846d80e..92f1078 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"dotenv": "^4.0.0",
"express": "^4.15.2",
"express-basic-auth": "^1.0.1",
+ "http-auth": "^3.1.3",
"knex": "^0.12.9",
"lodash": "^4.17.4",
"mysql": "^2.13.0",