diff options
| author | Tyler Mercier <tylermercier@gmail.com> | 2013-07-29 12:21:34 -0700 |
|---|---|---|
| committer | Tyler Mercier <tylermercier@gmail.com> | 2013-07-29 12:21:34 -0700 |
| commit | 9c889028be05270f3cfef1e926c75da2882bafe4 (patch) | |
| tree | 57098d57eb8c06e236d56c153448657dfa4d4c31 | |
| parent | 22fadbfe4ffb8d533d87273c9932ddf511942240 (diff) | |
| parent | fb2d2a8cefd9672e0c7cf62e5faa515339b8d2ec (diff) | |
Merge pull request #16 from madebyuppercut/mo
Upgrade to postgres 9.2
| -rw-r--r-- | config/recipes/postgresql.rb | 4 | ||||
| -rw-r--r-- | config/recipes/templates/monit/monitrc.erb | 2 | ||||
| -rw-r--r-- | config/recipes/templates/monit/unicorn.erb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config/recipes/postgresql.rb b/config/recipes/postgresql.rb index 014b109..63fa23b 100644 --- a/config/recipes/postgresql.rb +++ b/config/recipes/postgresql.rb @@ -2,14 +2,14 @@ set_default(:postgresql_host, "localhost") set_default(:postgresql_user) { application } set_default(:postgresql_password) { Capistrano::CLI.password_prompt "PostgreSQL Password: " } set_default(:postgresql_database) { "#{application}_#{rails_env}" } -set_default(:postgresql_pid) { "/var/run/postgresql/9.1-main.pid" } +set_default(:postgresql_pid) { "/var/run/postgresql/9.2-main.pid" } namespace :postgresql do desc "Install the latest stable release of PostgreSQL." task :install, roles: :db, only: {primary: true} do run "#{sudo} add-apt-repository -y ppa:pitti/postgresql" run "#{sudo} apt-get -y update" - run "#{sudo} apt-get -y install postgresql libpq-dev" + run "#{sudo} apt-get -y install postgresql-9.2 libpq-dev" end after "deploy:install", "postgresql:install" diff --git a/config/recipes/templates/monit/monitrc.erb b/config/recipes/templates/monit/monitrc.erb index 88816e0..d22e50f 100644 --- a/config/recipes/templates/monit/monitrc.erb +++ b/config/recipes/templates/monit/monitrc.erb @@ -13,7 +13,7 @@ set eventqueue # using tlsv1 # with timeout 30 seconds -set alert ryan@railscasts.com +set alert tyler@madebyuppercut.com set httpd port 2812 allow admin:"secret" diff --git a/config/recipes/templates/monit/unicorn.erb b/config/recipes/templates/monit/unicorn.erb index f75722a..8a0e7a3 100644 --- a/config/recipes/templates/monit/unicorn.erb +++ b/config/recipes/templates/monit/unicorn.erb @@ -10,6 +10,6 @@ check process <%= application %>_unicorn with pidfile <%= unicorn_pid %> if mem > 200.0 MB for 1 cycles then restart if cpu > 50% for 3 cycles then restart if 5 restarts within 5 cycles then timeout - alert ryan@railscasts.com only on { pid } + alert tyler@madebyuppercut.com only on { pid } if changed pid 2 times within 60 cycles then alert <% end %> |