From 1b16c6062a7a9be7a705a37b25a3485c2495a799 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sun, 18 Aug 2019 17:58:58 +1000
Subject: [PATCH] knexfile

---
 bin/client.sh                                 |  1 +
 bin/db.sh                                     |  9 +++++++
 bin/install.sh                                |  2 ++
 .../mnml.gg.PRODUCTION.nginx.conf             | 24 +++++++++++++++----
 ops/.gitignore                                |  2 ++
 ops/{knexfile.js => knexfile.SAMPLE.js}       |  0
 6 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100755 bin/db.sh
 rename ops/{knexfile.js => knexfile.SAMPLE.js} (100%)
 mode change 100755 => 100644

diff --git a/bin/client.sh b/bin/client.sh
index a2407748..922b77d3 100755
--- a/bin/client.sh
+++ b/bin/client.sh
@@ -18,3 +18,4 @@ cd $MNML_PATH/acp
 rm -rf dist
 npm i
 npm run build
+mv dist/* $MNML_PATH/client/dist/
diff --git a/bin/db.sh b/bin/db.sh
new file mode 100755
index 00000000..15faafe8
--- /dev/null
+++ b/bin/db.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# POSTGRES SETUP
+sudo -u postgres createdb mnml
+sudo -u postgres createuser --encrypted mnml
+
+PG_PASSWORD=$(openssl rand -hex 16)
+echo "database password is $PG_PASSWORD"
+sudo -u -E postgres psql -c "alter user mnml with encrypted password '$PG_PASSWORD';"
diff --git a/bin/install.sh b/bin/install.sh
index e4b48bbe..0bef7120 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -19,6 +19,8 @@ fi
 
 source $MNML_CONF
 
+# sudo certbot certonly --nginx -d mnml.gg -d acp.mnml.gg
+
 #       /var/lib/mnml
 # contains img data, builds
 sudo mkdir -p /var/lib/mnml/client
diff --git a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
index 875a10d7..cce73707 100644
--- a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
+++ b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
@@ -14,6 +14,8 @@ map $http_upgrade $connection_upgrade {
 
 # DEV
 server {
+    server_name mnml.gg;
+
     location / {
         root /var/lib/mnml/public/current;
         index index.html;
@@ -46,6 +48,23 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 }
 
+server {
+    server_name acp.mnml.gg;
+
+    location / {
+        root /var/lib/mnml/public/current/;
+        index acp.html;
+        try_files $uri $uri/ acp.html;
+    }
+
+    listen 443 ssl; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/mnml.gg/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/mnml.gg/privkey.pem; # managed by Certbot
+    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+}
+
+
 # http -> https
 server {
     server_name mnml.gg;
@@ -56,8 +75,3 @@ server {
     server_name minimal.gg;
     return 301 https://mnml.gg$request_uri;
 }
-
-server {
-    server_name cryps.gg;
-    return 301 https://mnml.gg$request_uri;
-}
diff --git a/ops/.gitignore b/ops/.gitignore
index 2a51843a..30d6c1cb 100755
--- a/ops/.gitignore
+++ b/ops/.gitignore
@@ -2,3 +2,5 @@ node_modules/
 package-lock.json
 molecules/
 bulk.sdf
+
+knexfile.js
diff --git a/ops/knexfile.js b/ops/knexfile.SAMPLE.js
old mode 100755
new mode 100644
similarity index 100%
rename from ops/knexfile.js
rename to ops/knexfile.SAMPLE.js