From ad5c14da2bf8d6141a3783d586173ac908cca352 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Wed, 13 Apr 2016 14:38:57 +0200 Subject: [PATCH 01/20] Guide on how to set up and use. --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 4c29665..dc97358 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,15 @@ # ggtrackerstack Project to run the whole ggtracker stack in vagrant + +### Running + * Make sure you have vagrant+virtualbox installed on your computer + * Run `vagrant up` to create the virtual box + * Run `vagrant ssh` to ssh into the vagrant box + * Find code in /vagrant + * Run the installation and updating steps of the components (ESDB and ggtracker) ([will be automated soon](https://github.com/gravelweb/ggtrackerstack/commit/e3bdbb30d9384d37e8b96692af81cefd5f8a87d2)) + * * ESDB: https://github.com/dsjoerg/esdb#installation-and-setup + * * ggtracker: https://github.com/dsjoerg/ggtracker#basic-installation-and-updating + * * * Note: You need to run ggtracker webapp like this `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`. + * Set up a hostname for the vagrant box's ip in /etc/hosts - e.g. `172.28.128.3 ggtracker.test` (change ip accordingly) + * The app will be on `ggtracker.test` in the browser and uploading should work - otherwise please raise an issue here, so it can be fixed. From 60224b2fdc5545f2216a33b275b319ff70cbe546 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Wed, 13 Apr 2016 14:41:18 +0200 Subject: [PATCH 02/20] Fix formatting --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dc97358..6109844 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ Project to run the whole ggtracker stack in vagrant * Run `vagrant ssh` to ssh into the vagrant box * Find code in /vagrant * Run the installation and updating steps of the components (ESDB and ggtracker) ([will be automated soon](https://github.com/gravelweb/ggtrackerstack/commit/e3bdbb30d9384d37e8b96692af81cefd5f8a87d2)) - * * ESDB: https://github.com/dsjoerg/esdb#installation-and-setup - * * ggtracker: https://github.com/dsjoerg/ggtracker#basic-installation-and-updating - * * * Note: You need to run ggtracker webapp like this `ESDB_HOST=172.28.128.3:9292 foreman start` (change ip accordingly) + * ESDB: https://github.com/dsjoerg/esdb#installation-and-setup + * ggtracker: https://github.com/dsjoerg/ggtracker#basic-installation-and-updating + * Note: You need to run ggtracker webapp like this `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`. * Set up a hostname for the vagrant box's ip in /etc/hosts - e.g. `172.28.128.3 ggtracker.test` (change ip accordingly) * The app will be on `ggtracker.test` in the browser and uploading should work - otherwise please raise an issue here, so it can be fixed. From 659ca607dba7c27efed750b00c74edb48be927c4 Mon Sep 17 00:00:00 2001 From: Jonathan Gravel Date: Tue, 12 Apr 2016 17:47:12 -0400 Subject: [PATCH 03/20] Organize dependencies by package Remove dependency on juggernaut since it is pulled during esdb install. --- setup-vagrantbox.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/setup-vagrantbox.sh b/setup-vagrantbox.sh index 3547b84..c3fc4cc 100644 --- a/setup-vagrantbox.sh +++ b/setup-vagrantbox.sh @@ -6,10 +6,20 @@ add-apt-repository ppa:chris-lea/redis-server -y apt-get update -apt-get install -y ruby redis-server nodejs npm mysql-server git-core ruby-dev libcurl4-openssl-dev libmysqlclient-dev build-essential libxml2-dev libxslt-dev memcached imagemagick libsasl2-dev python-pip python-dev libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python-tk +# GGTRACKER dependencies +apt-get install -y \ + ruby redis-server nodejs npm mysql-server git-core ruby-dev \ + libcurl4-openssl-dev libmysqlclient-dev build-essential libxml2-dev \ + libxslt-dev + +# ESDB dependencies +apt-get install -y \ + memcached imagemagick libsasl2-dev python-pip python-dev libtiff5-dev \ + libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev \ + tk8.6-dev python-tk gem install bundler npm install -g juggernaut -# Juggetnaut looks for `node` instead of `nodejs` +# Juggernaut looks for `node` instead of `nodejs` sudo ln -s /usr/bin/nodejs /usr/bin/node From c7d7cb787a2234bf2c74bb9cd31c0e1f58857423 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Wed, 13 Apr 2016 15:49:42 +0200 Subject: [PATCH 04/20] Use real repos instead of nickelsen forks. --- .gitmodules | 13 +++++-------- esdb | 2 +- ggpyjobs | 2 +- ggtracker | 2 +- sc2reader | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0f9962a..a7d336c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,13 @@ [submodule "ggpyjobs"] path = ggpyjobs - url = git@github.com:nickelsen/ggpyjobs.git - branch = vagrant + url = git@github.com:dsjoerg/ggpyjobs.git [submodule "ggtracker"] path = ggtracker - url = git@github.com:nickelsen/ggtracker.git - branch = vagrant + url = git@github.com:dsjoerg/ggtracker.git [submodule "esdb"] path = esdb - url = git@github.com:nickelsen/esdb.git - branch = vagrant + url = git@github.com:dsjoerg/esdb.git [submodule "sc2reader"] path = sc2reader - url = git@github.com:nickelsen/sc2reader.git - branch = vagrant + url = git@github.com:ggtracker/sc2reader.git + branch = upstream diff --git a/esdb b/esdb index e1baa3c..b6890c5 160000 --- a/esdb +++ b/esdb @@ -1 +1 @@ -Subproject commit e1baa3ccc01517773aef624b2164812150328760 +Subproject commit b6890c53b4c8cb34d571c1b1df2a688e232797e1 diff --git a/ggpyjobs b/ggpyjobs index 6bfa545..fa0a9aa 160000 --- a/ggpyjobs +++ b/ggpyjobs @@ -1 +1 @@ -Subproject commit 6bfa5452ab15ceb5db6c8c9bd819a58685aee3a3 +Subproject commit fa0a9aa97af869b2d15414c8f53fda9b68d84a0d diff --git a/ggtracker b/ggtracker index 669b958..38debcb 160000 --- a/ggtracker +++ b/ggtracker @@ -1 +1 @@ -Subproject commit 669b9580a78b18594f63e6bcbdd91bbd3f4e4702 +Subproject commit 38debcb98c5d21762bd23a3206b72da58eadddea diff --git a/sc2reader b/sc2reader index 5e6e235..504fff2 160000 --- a/sc2reader +++ b/sc2reader @@ -1 +1 @@ -Subproject commit 5e6e235fa399dc691519d38faa11d71667b69002 +Subproject commit 504fff2ed926c206b9aa74c70bbc017bb7c40718 From 4d4d13d3b1812178822c5f1f45e215b683d3c1c4 Mon Sep 17 00:00:00 2001 From: Jonathan Gravel Date: Tue, 12 Apr 2016 17:47:35 -0400 Subject: [PATCH 05/20] Initial whack at uber install script --- README.md | 12 ++++++------ Vagrantfile | 1 + install-ggtrackerstack.sh | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 install-ggtrackerstack.sh diff --git a/README.md b/README.md index 6109844..62a1746 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ Project to run the whole ggtracker stack in vagrant ### Running * Make sure you have vagrant+virtualbox installed on your computer - * Run `vagrant up` to create the virtual box + * Run `git submodule update --init` to pull submodules + * 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 - * Find code in /vagrant - * Run the installation and updating steps of the components (ESDB and ggtracker) ([will be automated soon](https://github.com/gravelweb/ggtrackerstack/commit/e3bdbb30d9384d37e8b96692af81cefd5f8a87d2)) - * ESDB: https://github.com/dsjoerg/esdb#installation-and-setup - * ggtracker: https://github.com/dsjoerg/ggtracker#basic-installation-and-updating - * Note: You need to run ggtracker webapp like this `ESDB_HOST=172.28.128.3:9292 foreman start` (change ip accordingly) + * Find code in /vagrant `cd /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`. * Set up a hostname for the vagrant box's ip in /etc/hosts - e.g. `172.28.128.3 ggtracker.test` (change ip accordingly) * The app will be on `ggtracker.test` in the browser and uploading should work - otherwise please raise an issue here, so it can be fixed. diff --git a/Vagrantfile b/Vagrantfile index b43a061..189da35 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,6 +4,7 @@ Vagrant.configure("2") do |config| config.vm.hostname = "ggtrackerstack" config.vm.provision "shell", path: "setup-vagrantbox.sh" + config.vm.provision "shell", path: "install-ggtrackerstack.sh", privileged: false config.vm.provider :virtualbox do |vb| vb.memory = 1536 diff --git a/install-ggtrackerstack.sh b/install-ggtrackerstack.sh new file mode 100644 index 0000000..5f4b5c7 --- /dev/null +++ b/install-ggtrackerstack.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +set -e + +cd /vagrant + + +echo INSTALLING GGTRACKER +# install ggtracker +(cd ggtracker && \ + bundle && \ + cp -np config/secrets.yml{.example,} && \ + cp -np config/s3.yml{.example,} && \ + rake db:create && \ + bundle exec rake db:schema:load) + +echo INSTALLING ESDB +(cd esdb && \ + cp -np config/database.yml{.example,} && \ + bundle && \ + (mysql -u root <<-"EOF" + create database if not exists esdb_development; + create database if not exists esdb_test; +EOF +) && \ + cp -np config/s3.yml{.example,} && \ + cp -np config/fog.rb{.example,} && \ + cp -np config/redis.yml{.example,} && \ + 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/ggtracker_provider.sql | mysql -u root -D esdb_development && \ + bundle exec rake py:init && \ + bundle exec sequel -m db/migrations -e test config/database.yml && \ + echo RUNNING TESTS && \ + bundle exec rspec) + +echo DONE install-ggtrackerstack.sh From 37fe0fbe698dd25640fe7f33b62488eba0dfba46 Mon Sep 17 00:00:00 2001 From: Jonathan Gravel Date: Wed, 13 Apr 2016 18:49:10 -0400 Subject: [PATCH 06/20] Use set -e in setup-vagrantbox.sh --- setup-vagrantbox.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup-vagrantbox.sh b/setup-vagrantbox.sh index c3fc4cc..ebfd38c 100644 --- a/setup-vagrantbox.sh +++ b/setup-vagrantbox.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + export DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:chris-lea/redis-server -y From 4b4b5bba92f9582feca698656fbc44f9b0f162df Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Sun, 17 Apr 2016 11:18:00 +0200 Subject: [PATCH 07/20] Updated esdb after PR #5. --- esdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esdb b/esdb index b6890c5..4f53452 160000 --- a/esdb +++ b/esdb @@ -1 +1 @@ -Subproject commit b6890c53b4c8cb34d571c1b1df2a688e232797e1 +Subproject commit 4f534525ba2abade1311f420a59815504cef54fc From 906933416cad446016dc3c3528f6f5a70e86c2c0 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Sun, 17 Apr 2016 11:52:59 +0200 Subject: [PATCH 08/20] README links to bucket setup and remove unnecessary hostname instructions. --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 62a1746..0bfe0ad 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,5 @@ 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`. - * Set up a hostname for the vagrant box's ip in /etc/hosts - e.g. `172.28.128.3 ggtracker.test` (change ip accordingly) - * The app will be on `ggtracker.test` in the browser and uploading should work - otherwise please raise an issue here, so it can be fixed. + * 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). + * 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. From 3d333004cb4a2ce23470173d8780ec3b9192442e Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Mon, 18 Apr 2016 11:03:23 +0200 Subject: [PATCH 09/20] Documentation for making changes to ggtracker and esdb. --- README.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/README.md b/README.md index 0bfe0ad..6053e47 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,33 @@ Project to run the whole ggtracker stack in vagrant * 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). * 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 +The components needed to run ggtracker.com are included in this project as submodules. We generally track the `master` branch of the official repos, except for sc2reader, which tracks the `upstream` branch. + +##### Making changes to `ggtracker`, `esdb` and `ggpyjobs` +To make a change to `ggtracker`, `esdb` or `ggpyjobs` and testing that they work in your local setup, we recommended that you fork the component to your own github account and add the fork to your working copy of ggtrackerstack like this (using `esdb` forked to `nickelsen` as example): + * Fork the component on github (e.g. nickelsen/esdb). + * Go to the ggtrackerstack directory of the component (e.g. ggtracker, esdb or esdb/vendor/ggpyjobs). + * Set your fork ssh url as the origin remote: `git remote set-url origin git@github.com:nickelsen/esdb.git`. + * Add the official repo ssh url as the upstream remote: `git remote add upstream git@github.com:dsjoerg/esdb.git`. + * Check your setup with `git remote -v` - should look like this (with your account instead of nickelsen). +``` +origin git@github.com:nickelsen/esdb.git (fetch) +origin git@github.com:nickelsen/esdb.git (push) +upstream git@github.com:dsjoerg/esdb.git (fetch) +upstream git@github.com:dsjoerg/esdb.git (push) +``` + * Once your remotes are set up, you can branch off master of your fork (`git checkout -b `), make your application changes, commit and push to your remote and create a pull-request against the official repo. + * **Note:** If you work on `ggpyjobs`, you need to also make a pull-request to `esdb` to make `esdb` actually use your new and improved version of `ggpyjobs` (we'll hopefully automate this remote tracking at some point). + * When the official repo changes (e.g. your pull-request is merged), you can update your working copy like this: + * `git fetch upstream` + * `git merge upstream/master` + * You can sync your `master` branch to the `master` branch of the `upstream` like this: + * `git checkout master` + * `git fetch upstream` + * `git merge upstream/master` + * `git push origin master` + +##### Making changes to `sc2reader` +Per default, `sc2reader` is managed by [requirements.txt](https://github.com/dsjoerg/ggpyjobs/blob/master/requirements.txt) in `ggpyjobs`. To work on `sc2reader` it is recommended to use the cloned submodule at the root of `ggtrackerstack` and install that in development mode on the vagrant box by issuing `python setup.py develop` in `/vagrant/sc2reader` after ssh'ing into the vagrant box. Forks and branches are managed as described above. From 1a22d3b1041ce83721b1c0d09326ec8eabbe09b0 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Mon, 18 Apr 2016 15:18:17 +0200 Subject: [PATCH 10/20] Remove redundant ggpyjobs - already in esdb repo. --- .gitmodules | 3 --- ggpyjobs | 1 - 2 files changed, 4 deletions(-) delete mode 160000 ggpyjobs diff --git a/.gitmodules b/.gitmodules index a7d336c..36536c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "ggpyjobs"] - path = ggpyjobs - url = git@github.com:dsjoerg/ggpyjobs.git [submodule "ggtracker"] path = ggtracker url = git@github.com:dsjoerg/ggtracker.git diff --git a/ggpyjobs b/ggpyjobs deleted file mode 160000 index fa0a9aa..0000000 --- a/ggpyjobs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fa0a9aa97af869b2d15414c8f53fda9b68d84a0d From 4364567ae356cbb1ba33272308a117c0dd1241a9 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Tue, 19 Apr 2016 16:26:57 +0200 Subject: [PATCH 11/20] Submodules track remote branches. --- .gitmodules | 4 +++- esdb | 2 +- ggtracker | 2 +- sc2reader | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 36536c4..9d8134b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,12 @@ [submodule "ggtracker"] path = ggtracker url = git@github.com:dsjoerg/ggtracker.git + branch = master [submodule "esdb"] path = esdb url = git@github.com:dsjoerg/esdb.git + branch = master [submodule "sc2reader"] path = sc2reader url = git@github.com:ggtracker/sc2reader.git - branch = upstream + branch = upstream diff --git a/esdb b/esdb index 4f53452..e13be8e 160000 --- a/esdb +++ b/esdb @@ -1 +1 @@ -Subproject commit 4f534525ba2abade1311f420a59815504cef54fc +Subproject commit e13be8e3d344460d7cae486a0c5e4794b5fba296 diff --git a/ggtracker b/ggtracker index 38debcb..582b7d9 160000 --- a/ggtracker +++ b/ggtracker @@ -1 +1 @@ -Subproject commit 38debcb98c5d21762bd23a3206b72da58eadddea +Subproject commit 582b7d91ffa398aa31771be6668a2f468ff6b1e2 diff --git a/sc2reader b/sc2reader index 504fff2..80ea580 160000 --- a/sc2reader +++ b/sc2reader @@ -1 +1 @@ -Subproject commit 504fff2ed926c206b9aa74c70bbc017bb7c40718 +Subproject commit 80ea58043a9375aff8719b26b70ec154f569d7a3 From 9bbf0eab053cdddf3062a9d82278e347b4162633 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Wed, 20 Apr 2016 13:18:02 +0200 Subject: [PATCH 12/20] Add AI identities to esdb db during install. --- install-ggtrackerstack.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-ggtrackerstack.sh b/install-ggtrackerstack.sh index 5f4b5c7..e92084e 100644 --- a/install-ggtrackerstack.sh +++ b/install-ggtrackerstack.sh @@ -31,6 +31,7 @@ EOF 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/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 && \ bundle exec sequel -m db/migrations -e test config/database.yml && \ echo RUNNING TESTS && \ From 88424df44c3cec45824b487d54107abd55b368fa Mon Sep 17 00:00:00 2001 From: dsjoerg Date: Tue, 26 Apr 2016 15:55:48 -0400 Subject: [PATCH 13/20] add command for updating all submodules to latest --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6053e47..b7ca8e7 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,10 @@ 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` to pull submodules + * Run `git submodule update --init --remote --merge --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) * Find code in /vagrant `cd /vagrant` * Start the application (requires 2 ssh sessions, or run them as background jobs) * ESDB: `(cd esdb && foreman start)` From 830d7868b7d379e415482737a01420276830b13d Mon Sep 17 00:00:00 2001 From: dsjoerg Date: Tue, 26 Apr 2016 15:56:18 -0400 Subject: [PATCH 14/20] updating submodules to latest --- esdb | 2 +- ggtracker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/esdb b/esdb index e13be8e..f3be60a 160000 --- a/esdb +++ b/esdb @@ -1 +1 @@ -Subproject commit e13be8e3d344460d7cae486a0c5e4794b5fba296 +Subproject commit f3be60a17d8141d7c68cd542ceaebea47ff8e67f diff --git a/ggtracker b/ggtracker index 582b7d9..67aba1c 160000 --- a/ggtracker +++ b/ggtracker @@ -1 +1 @@ -Subproject commit 582b7d91ffa398aa31771be6668a2f468ff6b1e2 +Subproject commit 67aba1c4a2cffaf44e9c9675578b1046d5c5b3cf From 51c68afa59ef7c9dba8a4a97ed64157fc1410359 Mon Sep 17 00:00:00 2001 From: Anders Nickelsen Date: Wed, 27 Apr 2016 12:51:37 +0200 Subject: [PATCH 15/20] 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 16/20] 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 17/20] 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 18/20] 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 19/20] 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 20/20] 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