ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "nginx stuff for acp"

Browse Source 
This reverts commit f84f458ebe52423b7aa6a9f6c633ce95f432396a.
This commit is contained in:
ntr 2019-08-14 18:39:58 +10:00
parent bd51820279
commit c11dac617d
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acp/src/acp.game.list.jsx
View File

@ -3,6 +3,8 @@ const { Component } = require('preact');
const { connect } = require('preact-redux'); const { connect } = require('preact-redux');
const linkState = require('linkstate').default; const linkState = require('linkstate').default;
const axios = require('axios');
const actions = require('./actions'); const actions = require('./actions');
const addState = connect( const addState = connect(

1
bin/client.sh
View File

@ -18,4 +18,3 @@ cd $MNML_PATH/acp
rm -rf dist rm -rf dist
npm i npm i
npm run build npm run build
mv dist/* $MNML_PATH/client/dist/

13
bin/deploy.sh
View File

@ -6,8 +6,12 @@ MNML_PATH=$(realpath "$DIR/../")
VERSION=$(<"$MNML_PATH/VERSION") VERSION=$(<"$MNML_PATH/VERSION")
SERVER_BIN_DIR="/usr/local/mnml/bin" SERVER_BIN_DIR="/usr/local/mnml/bin"
CLIENT_DIST_DIR="/var/lib/mnml/client" CLIENT_DIST_DIR="/var/lib/mnml/client"
CLIENT_PUBLIC_DIR="/var/lib/mnml/public/current" CLIENT_PUBLIC_DIR="/var/lib/mnml/public/client"
ACP_DIST_DIR="/var/lib/mnml/acp"
ACP_PUBLIC_DIR="/var/lib/mnml/public/acp"
# server updates # server updates
echo "syncing server $VERSION " echo "syncing server $VERSION "
@ -16,9 +20,14 @@ ssh -q mnml ln -nfs "$SERVER_BIN_DIR/$VERSION" "$SERVER_BIN_DIR/mnml"
ssh -q mnml ls -lah "$SERVER_BIN_DIR" ssh -q mnml ls -lah "$SERVER_BIN_DIR"
# client updates # client updates
echo "syncing client and acp $VERSION" echo "syncing client $VERSION"
rsync -a --delete --delete-excluded "$MNML_PATH/client/dist/" mnml:"$CLIENT_DIST_DIR/$VERSION/" rsync -a --delete --delete-excluded "$MNML_PATH/client/dist/" mnml:"$CLIENT_DIST_DIR/$VERSION/"
ssh -q mnml ln -nfs "$CLIENT_DIST_DIR/$VERSION" "$CLIENT_PUBLIC_DIR" ssh -q mnml ln -nfs "$CLIENT_DIST_DIR/$VERSION" "$CLIENT_PUBLIC_DIR"
# acp updates
echo "syncing acp $VERSION"
rsync -a --delete --delete-excluded "$MNML_PATH/acp/dist/" mnml:"$ACP_DIST_DIR/$VERSION/"
ssh -q mnml ln -nfs "$ACP_DIST_DIR/$VERSION" "$ACP_PUBLIC_DIR"
ssh -q mnml ls -lah "/var/lib/mnml/public" ssh -q mnml ls -lah "/var/lib/mnml/public"
echo "restarting mnml service" echo "restarting mnml service"

13
etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
View File

@ -1,4 +1,4 @@
error_log /var/log/mnml/nginx.log debug; error_log /var/log/mnml/nginx.log;
upstream mnml_http { upstream mnml_http {
server 127.0.0.1:40000; server 127.0.0.1:40000;
@ -8,6 +8,7 @@ upstream mnml_ws {
server 127.0.0.1:40055; server 127.0.0.1:40055;
} }
map $http_upgrade $connection_upgrade { map $http_upgrade $connection_upgrade {
default upgrade; default upgrade;
'' close; '' close;
@ -15,14 +16,18 @@ map $http_upgrade $connection_upgrade {
# DEV # DEV
server { server {
server_name mnml.gg;
location / { location / {
root /var/lib/mnml/public/client/; root /var/lib/mnml/public/client;
index index.html; index index.html;
try_files $uri $uri/ index.html; try_files $uri $uri/ index.html;
} }
location /acp {
root /var/lib/mnml/public/acp;
index acp.html;
try_files $uri $uri/ acp.html;
}
location /imgs/ { location /imgs/ {
root /var/lib/mnml/public/; root /var/lib/mnml/public/;
try_files $uri $uri/ =404; try_files $uri $uri/ =404;