From 51c68afa59ef7c9dba8a4a97ed64157fc1410359 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Wed, 27 Apr 2016 12:51:37 +0200 Subject: [PATCH 1/6] Don't merge on initialization. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b7ca8e7..5f6c913 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Project to run the whole ggtracker stack in vagrant ### Running * Make sure you have vagrant+virtualbox installed on your computer - * Run `git submodule update --init --remote --merge --recursive` to pull the latest version of each submodule + * Run `git submodule update --init --remote --recursive` to pull the latest version of each submodule * Run `vagrant up` to create the virtual box. This will download all required packages and go through the installation process for ggtracker and ESDB (~15 minutes; go make yourself a sandwich) * Run `vagrant ssh` to ssh into the vagrant box * Make a note of your vagrant IP: In the text it prints out upon login it says IP address for eth1: 172.28.128.3 (potentially some other ip) From ae9277b00524773ec071764a70415d3a617c6858 Mon Sep 17 00:00:00 2001 From: dsjoerg Date: Wed, 27 Apr 2016 14:28:39 -0400 Subject: [PATCH 2/6] update the replays_sq_skill_stat table to have LotV-style minutes; also put the replays_econ_stat table in as part of the test env setup --- install-ggtrackerstack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-ggtrackerstack.sh b/install-ggtrackerstack.sh index e92084e..f15b83b 100644 --- a/install-ggtrackerstack.sh +++ b/install-ggtrackerstack.sh @@ -29,7 +29,7 @@ EOF cp -np config/esdb.yml{.example,} && \ cp -np config/tokens.yml{.example,} && \ bundle exec sequel -m db/migrations -e development config/database.yml && \ - cat db/replays_sq_skill_stat.sql | mysql -u root -D esdb_development && \ + cat db/league_tables.sql | mysql -u root -D esdb_development && \ cat db/ggtracker_provider.sql | mysql -u root -D esdb_development && \ cat db/add_ai_identities.sql | mysql -u root -D esdb_development && \ bundle exec rake py:init && \ From 97d106661936e55fbd26df6cabb650dd76e94f83 Mon Sep 17 00:00:00 2001 From: dsjoerg Date: Wed, 27 Apr 2016 14:28:56 -0400 Subject: [PATCH 3/6] new esdb and ggtracker --- esdb | 2 +- ggtracker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/esdb b/esdb index f3be60a..edae1a7 160000 --- a/esdb +++ b/esdb @@ -1 +1 @@ -Subproject commit f3be60a17d8141d7c68cd542ceaebea47ff8e67f +Subproject commit edae1a7ddba03203443e263d98f4cd51468d3803 diff --git a/ggtracker b/ggtracker index 67aba1c..dcab52f 160000 --- a/ggtracker +++ b/ggtracker @@ -1 +1 @@ -Subproject commit 67aba1c4a2cffaf44e9c9675578b1046d5c5b3cf +Subproject commit dcab52f4a2ac2e048a8e9e4691436d646a2663e9 From 54a9bac9f93cf8f22dec5838d5aac501ce6d0b41 Mon Sep 17 00:00:00 2001 From: dsjoerg Date: Wed, 24 Aug 2016 15:10:33 -0400 Subject: [PATCH 4/6] update all submodules to latest --- esdb | 2 +- ggtracker | 2 +- sc2reader | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/esdb b/esdb index edae1a7..34a12a0 160000 --- a/esdb +++ b/esdb @@ -1 +1 @@ -Subproject commit edae1a7ddba03203443e263d98f4cd51468d3803 +Subproject commit 34a12a09156f4a3e437a70abcb579c2a8325bef1 diff --git a/ggtracker b/ggtracker index dcab52f..e81860a 160000 --- a/ggtracker +++ b/ggtracker @@ -1 +1 @@ -Subproject commit dcab52f4a2ac2e048a8e9e4691436d646a2663e9 +Subproject commit e81860a887dfe814b0d24ab540291dae47eb58fc diff --git a/sc2reader b/sc2reader index 80ea580..a131d50 160000 --- a/sc2reader +++ b/sc2reader @@ -1 +1 @@ -Subproject commit 80ea58043a9375aff8719b26b70ec154f569d7a3 +Subproject commit a131d50f31bf30d431157c8670d51b1e492ae9ea From d98788731f74a2f43a6f7d20415c106f196c5d5d Mon Sep 17 00:00:00 2001 From: Yuanxuan Wang Date: Sun, 16 Apr 2017 21:16:45 -0700 Subject: [PATCH 5/6] Update README for ggtracker s3 set up --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f6c913..7cd5aca 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Project to run the whole ggtracker stack in vagrant * Start the application (requires 2 ssh sessions, or run them as background jobs) * ESDB: `(cd esdb && foreman start)` * ggtracker: `(cd ggtracker && ESDB_HOST=172.28.128.3:9292 foreman start)` (change IP accordingly) - * Set up Amazon AWS S3 buckets for development as described in [esdb/config/s3.yml.example](https://github.com/dsjoerg/esdb/blob/master/config/s3.yml.example) (only dev and test are needed) and set up buckets and credentials accordingly in `esdb/config/s3.yml`. All buckets need to be [publicly readable](https://ariejan.net/2010/12/24/public-readable-amazon-s3-bucket-policy/) and the replay bucket needs to have [CORS enabled for GET, PUT and POST](http://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html). + * Set up Amazon AWS S3 buckets for development as described in [esdb/config/s3.yml.example](https://github.com/dsjoerg/esdb/blob/master/config/s3.yml.example) (only dev and test are needed) and set up buckets and credentials accordingly in `esdb/config/s3.yml` and `ggtracker/config/s3.yml`. All buckets need to be [publicly readable](https://ariejan.net/2010/12/24/public-readable-amazon-s3-bucket-policy/) and the replay bucket needs to have [CORS enabled for GET, PUT and POST](http://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html). * The app will be on the ip of the vagrant box and uploading a replay should work - otherwise please raise an issue here, so it can be fixed. ### Making changes to components From 1e00ca05b085b0ac01535c1daa1b43b2de66b57c Mon Sep 17 00:00:00 2001 From: dsjoerg Date: Sat, 29 Jul 2017 08:33:03 -0400 Subject: [PATCH 6/6] clarify in README how to get to the ggtracker homepage --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7cd5aca..ec02f65 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Project to run the whole ggtracker stack in vagrant * ESDB: `(cd esdb && foreman start)` * ggtracker: `(cd ggtracker && ESDB_HOST=172.28.128.3:9292 foreman start)` (change IP accordingly) * Set up Amazon AWS S3 buckets for development as described in [esdb/config/s3.yml.example](https://github.com/dsjoerg/esdb/blob/master/config/s3.yml.example) (only dev and test are needed) and set up buckets and credentials accordingly in `esdb/config/s3.yml` and `ggtracker/config/s3.yml`. All buckets need to be [publicly readable](https://ariejan.net/2010/12/24/public-readable-amazon-s3-bucket-policy/) and the replay bucket needs to have [CORS enabled for GET, PUT and POST](http://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html). + * Open your browser to 172.28.128.3:3000 (or whatever your vagrant IP is from the previous step) * The app will be on the ip of the vagrant box and uploading a replay should work - otherwise please raise an issue here, so it can be fixed. ### Making changes to components