more renaming

This commit is contained in:
ntr
2019-05-25 15:52:37 +10:00
parent 6a20e72a64
commit 7e2a95204e
13 changed files with 23 additions and 59 deletions
+4 -4
View File
@@ -2,10 +2,10 @@
# sudo apt-get install -y postgresql postgresql-contrib
sudo service postgresql start
sudo -u postgres dropdb constructs
sudo -u postgres createdb constructs
sudo -u postgres createuser --enconstructted constructs
sudo -u postgres psql -c "alter user constructs with enconstructted password 'craftbeer';"
sudo -u postgres dropdb mnml
sudo -u postgres createdb mnml
sudo -u postgres createuser --encrypted mnml
sudo -u postgres psql -c "alter user mnml with encrypted password 'craftbeer';"
# npm i
npm run migrate
+2 -2
View File
@@ -3,8 +3,8 @@
const local = {
client: 'postgresql',
connection: {
database: 'constructs',
user: 'constructs',
database: 'mnml',
user: 'mnml',
password: 'craftbeer'
},
pool: {
-10
View File
@@ -1,5 +1,3 @@
const NULL_UUID = '00000000-0000-0000-0000-000000000000';
exports.up = async knex => {
await knex.schema.createTable('games', table => {
table.uuid('id').primary();
@@ -67,14 +65,6 @@ exports.up = async knex => {
.inTable('games')
.onDelete('NO ACTION');
});
// not really sure if this is a good idea
await knex('instances').insert({
id: NULL_UUID,
data: 'INVALID',
open: false,
});
};
exports.down = async () => {};
-28
View File
@@ -1,28 +0,0 @@
exports.up = async knex => {
await knex.schema.createTable('zones', async (table) => {
table.uuid('id').primary();
table.index('id');
table.timestamps(true, true);
table.binary('data').notNullable();
table.boolean('active')
.defaultTo(true)
.notNullable();
table.uuid('account').notNullable()
table.foreign('account')
.references('id')
.inTable('accounts')
.onDelete('CASCADE');
table.index('account');
await knex.schema.raw(
// eslint-disable-next-line max-len
'CREATE UNIQUE INDEX zones_account_active ON zones (account) WHERE active = true;'
);
});
};
exports.down = async () => {};
@@ -8,7 +8,7 @@ map $http_upgrade $connection_upgrade {
}
server {
root /home/git/constructs/client/dist/;
root /home/git/cryps/client/dist/;
index index.html;
server_name mnml.gg; # managed by Certbot
@@ -23,10 +23,10 @@ server {
listen [::]:443 ssl ipv6only=on; # managed by Certbot
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsenconstructt/live/mnml.gg/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsenconstructt/live/mnml.gg/privkey.pem; # managed by Certbot
include /etc/letsenconstructt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /etc/letsenconstructt/ssl-dhparams.pem; # 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
location /ws {
proxy_pass http://mnml;
@@ -37,6 +37,7 @@ server {
}
}
# http -> https
server {
server_name mnml.gg;
return 301 https://$host$request_uri;
@@ -48,6 +49,6 @@ server {
}
server {
server_name constructs.gg;
server_name cryps.gg;
return 301 https://mnml.gg$request_uri;
}