diff --git a/README.md b/README.md index b7ca8e7..ec02f65 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) @@ -11,7 +11,8 @@ 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). + * 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 diff --git a/esdb b/esdb index f3be60a..34a12a0 160000 --- a/esdb +++ b/esdb @@ -1 +1 @@ -Subproject commit f3be60a17d8141d7c68cd542ceaebea47ff8e67f +Subproject commit 34a12a09156f4a3e437a70abcb579c2a8325bef1 diff --git a/ggtracker b/ggtracker index 67aba1c..e81860a 160000 --- a/ggtracker +++ b/ggtracker @@ -1 +1 @@ -Subproject commit 67aba1c4a2cffaf44e9c9675578b1046d5c5b3cf +Subproject commit e81860a887dfe814b0d24ab540291dae47eb58fc 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 && \ diff --git a/sc2reader b/sc2reader index 80ea580..a131d50 160000 --- a/sc2reader +++ b/sc2reader @@ -1 +1 @@ -Subproject commit 80ea58043a9375aff8719b26b70ec154f569d7a3 +Subproject commit a131d50f31bf30d431157c8670d51b1e492ae9ea