Permalink
Browse files

Use puma instead of passenger for graylog-web, since it works much be…

…tter with JRuby.
  • Loading branch information...
nirvdrum committed Aug 23, 2012
1 parent 13a0268 commit 741970583e424bdf933a0383559db643a4d4b161
@@ -81,9 +81,13 @@
rubber.update_code_for_bootstrap
rubber.run_config(:file => "role/graylog_web/", :force => true, :deploy_path => release_path)
-
+
rubber.sudo_script 'bootstrap_graylog_web', <<-ENDSCRIPT
cd #{rubber_env.graylog_web_dir}
+
+ # Add puma to the Gemfile so we can run the server.
+ echo "gem 'puma'" >> Gemfile
+
export RAILS_ENV=production
bundle install
@@ -9,7 +9,7 @@ stop on runlevel [016]
script
cd <%= rubber_env.graylog_web_dir %>
- exec bash -l -c "passenger start -e production --user <%= rubber_env.app_user %> -p <%= rubber_env.graylog_web_port %> --log-file <%= rubber_env.graylog_web_dir %>/log/server.log"
+ exec bash -l -c "bundle exec puma -p <%= rubber_env.graylog_web_port %> <%= rubber_env.graylog_web_dir %>/config.ru"
end script
post-start script
@@ -37,6 +37,6 @@ roles:
packages: [openjdk-6-jdk, mongodb-10gen]
graylog_web:
packages: [libcurl4-openssl-dev]
- gems: [[passenger, "#{passenger_version || '3.0.7'}"]]
+ gems: [puma]
gems: [gelf, graylog2_exceptions, graylog2-resque]

0 comments on commit 7419705

Please sign in to comment.