mirror of
https://github.com/gooba42/adventureland.git
synced 2026-10-21 04:31:27 -05:00
No more App Engine
This commit is contained in:
+15
-9
@@ -1,13 +1,19 @@
|
||||
// Mappings: config.py + Cloudflare
|
||||
machines={
|
||||
"eud1":{
|
||||
"key":"~/thegame/design/docs/id_rsa.pem",
|
||||
"ip":"195.201.181.245",
|
||||
// "eud1":{
|
||||
// "key":"~/thegame/design/docs/id_rsa.pem",
|
||||
// "ip":"195.201.181.245",
|
||||
// "user":"root",
|
||||
// "map":"eud1",
|
||||
// },
|
||||
"euw1":{
|
||||
"key":"~/server_admin/keys/hetzner_dedicated",
|
||||
"ip":"195.201.105.60",
|
||||
"user":"root",
|
||||
"map":"eud1",
|
||||
"map":"euw1",
|
||||
},
|
||||
"usd1":{
|
||||
"key":"~/thegame/design/docs/id_rsa.pem",
|
||||
"key":"~/server_admin/keys/usd1_dedicated",
|
||||
"ip":"158.69.23.127",
|
||||
"user":"ubuntu",
|
||||
"map":"usd1",
|
||||
@@ -68,19 +74,19 @@ servers=[
|
||||
"region":"EU",
|
||||
"name":"I",
|
||||
"port":2053,
|
||||
"machine":"eud1",
|
||||
"machine":"euw1",
|
||||
},
|
||||
{
|
||||
"region":"EU",
|
||||
"name":"II",
|
||||
"port":2083,
|
||||
"machine":"eud1",
|
||||
"machine":"euw1",
|
||||
},
|
||||
{
|
||||
"region":"EU",
|
||||
"name":"PVP",
|
||||
"port":2087,
|
||||
"machine":"eud1",
|
||||
"machine":"euw1",
|
||||
},
|
||||
// {
|
||||
// "region":"EU",
|
||||
@@ -92,7 +98,7 @@ servers=[
|
||||
"region":"ASIA",
|
||||
"name":"I",
|
||||
"port":8443,
|
||||
"machine":"eud1",
|
||||
"machine":"euw1",
|
||||
},
|
||||
{
|
||||
"region":"US",
|
||||
|
||||
@@ -12,10 +12,10 @@ setInterval(function(){
|
||||
servers.forEach(function(server){
|
||||
if(server.machine!=id) return;
|
||||
var name=server.region+" "+server.name+" "+server.port;
|
||||
if(output.indexOf("node server/server.js "+server.region+" "+server.name+" "+server.port)==-1)
|
||||
if(output.indexOf("node adventureland/server.js "+server.region+" "+server.name+" "+server.port)==-1)
|
||||
{
|
||||
console.log("Server not running: "+name);
|
||||
var command="ssh -i "+machine.key+" "+machine.user+"@"+machine.ip+" \"nohup node server/server.js "+server.region+" "+server.name+" "+server.port+" > s"+server.port+".out 2> s"+server.port+".err < /dev/null &\"";
|
||||
var command="ssh -i "+machine.key+" "+machine.user+"@"+machine.ip+" \"nohup node adventureland/server.js "+server.region+" "+server.name+" "+server.port+" > s"+server.port+".out 2> s"+server.port+".err < /dev/null &\"";
|
||||
console.log(command);
|
||||
f.execso(command);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,6 @@ servers.forEach(function(server){
|
||||
console.log(command);
|
||||
command="["+server.machine+" logs] scp -i "+machine.key+" "+machine.user+"@"+machine.ip+":s"+server.port+".out .";
|
||||
console.log(command);
|
||||
command="["+server.machine+" run] ssh -i "+machine.key+" "+machine.user+"@"+machine.ip+" \"nohup node server/server.js "+server.region+" "+server.name+" "+server.port+" > s"+server.port+".out 2> s"+server.port+".err < /dev/null &\"";
|
||||
command="["+server.machine+" run] ssh -i "+machine.key+" "+machine.user+"@"+machine.ip+" \"nohup node adventureland/server.js "+server.region+" "+server.name+" "+server.port+" > s"+server.port+".out 2> s"+server.port+".err < /dev/null &\"";
|
||||
console.log(command);
|
||||
});
|
||||
@@ -3,7 +3,7 @@ require(process.env.HOME+"/thegame/scripts/data.js");
|
||||
|
||||
servers.forEach(function(server){
|
||||
var machine=machines[server.machine];
|
||||
var command="ssh -i "+machine.key+" "+machine.user+"@"+machine.ip+" \"nohup node server/server.js "+server.region+" "+server.name+" "+server.port+" > s"+server.port+".out 2> s"+server.port+".err < /dev/null &\"";
|
||||
var command="ssh -i "+machine.key+" "+machine.user+"@"+machine.ip+" \"source ~/.nvm/nvm.sh && screen -dm bash -c 'node adventureland/server.js "+server.region+" "+server.name+" "+server.port+" > adventureland/s"+server.port+".out 2> adventureland/s"+server.port+".err'\"";
|
||||
console.log(command);
|
||||
f.execso(command);
|
||||
});
|
||||
@@ -8,7 +8,7 @@ for(var id in machines)
|
||||
{
|
||||
var machine=machines[id];
|
||||
// var command="scp -qv -r -i "+machine.key+" ~/deploy/server "+machine.user+"@"+machine.ip+":./ 2>&1 | grep -e 'Sending file modes' -e 'Exit status'";
|
||||
var command="rsync -ru --exclude='node_modules/' ~/deploy/server -i "+machine.key+" "+machine.user+"@"+machine.ip+":./";
|
||||
var command="rsync -rui --exclude='node_modules/' --exclude='package-lock.json' -e 'ssh -i "+machine.key+"' ~/deploy/server/ "+machine.user+"@"+machine.ip+":./adventureland/";
|
||||
//var command="rsync -ru ~/deploy/server -e \"ssh -i "+machine.key+"\" "+machine.user+"@"+machine.ip+":./";
|
||||
// Spent 50 minutes on perfecting the scp output, bastards didn't provide a non-interactive output argument ... [05/08/18]
|
||||
// command+=" > /tmp/scp.log 2>&1";
|
||||
|
||||
Reference in New Issue
Block a user