Merge branch 'master' of github.com:travis-ci/travis-hub

Conflicts:
	Gemfile.lock

.travis.yml

@@ -1,5 +1,4 @@
 rvm: jruby
-gemfile: Jemfile
 notifications:
   irc: "irc.freenode.org#travis"
 

Procfile

@@ -1 +1 @@
-hub: sh script/jruby -S thor travis:hub:start -e production
+hub: thor travis:hub:start -e production

README.md

@@ -27,22 +27,28 @@ filee.
 Travis Hub is JRuby-based. Make sure you have Sun or OpenJDK 6, install JRuby via RVM (or any other way) and then do
 
     gem install bundler
-    bundle install --gemfile Jemfile
+    bundle install
 
 Hub uses [travis-core](https://github.com/travis-ci/travis-core) and [travis-support](https://github.com/travis-ci/travis-support) that evolve
 rapidly, so keep your eye on those two.
 
 
-### PostgreSQL
+### Deploying on Heroku
 
-Primary database used by travis-ci.org is PostgreSQL and Hub uses it extensively. While we use 9.0 in production, 8.4 and 9.1 will work
-just as well.
+Heroku supports JRuby but only as a _labs_ feature. Add the following to have Heroku use JRuby when compiling and deploying the slug/dyno.
+
+    gem install heroku
 
+    heroku plugins:install https://github.com/heroku/heroku-labs.git
+    heroku labs:enable user_env_compile
+    heroku config:add RUBY_VERSION='jruby-1.6.5.1'
+    heroku config:add JAVA_OPTS="-Xmx384m -Xss512k -XX:+UseCompressedOops -Dfile.encoding=UTF-8"
 
-### Jemfile?
 
-We use the "Jemfile trick" to deploy Hub to Heroku. Other than that, it is just a gemfile. You also don't have to use Maven
-locally during development, it is only used during deployment.
+### PostgreSQL
+
+Primary database used by travis-ci.org is PostgreSQL and Hub uses it extensively. While we use 9.0 in production, 8.4 and 9.1 will work
+just as well.
 
 
 ## Configuration

config/travis.example.yml

@@ -39,7 +39,7 @@ production:
     port: 5672
     username: cute.bunny
     password: t0p.s3kr3t
-    vhost: travis.production
+    vhost: travisci.production
   pusher:
     app_id: 12345
     key: sdf98sdyf9sdf798sd7f
@@ -57,15 +57,15 @@ production:
 development:
   database:
     host: localhost
-    database: travis_development
-    username: travis
+    database: travisci_development
+    username: travisci
     password:
   amqp:
     host: localhost
     port: 5672
-    username: travis_hub
-    password: travis_hub_password
-    vhost: travis.development
+    username: travisci_hub
+    password: travisci_hub_password
+    vhost: travisci.development
   notifications:
     - worker
 

script/set_rabbitmq_env_up.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-rabbitmqctl add_vhost "travis.development"
-rabbitmqctl add_user travis_hub travis_hub_password
+rabbitmqctl add_vhost "travisci.development"
+rabbitmqctl add_user travisci_hub travisci_hub_password
 
-rabbitmqctl set_permissions -p "travis.development" travis_hub ".*" ".*" ".*"
-rabbitmqctl set_permissions -p "travis.development" guest      ".*" ".*" ".*"
+rabbitmqctl set_permissions -p "travisci.development" travisci_hub ".*" ".*" ".*"
+rabbitmqctl set_permissions -p "travisci.development" guest      ".*" ".*" ".*"