aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/deploy.rb12
-rw-r--r--doc/CHANGES.md6
2 files changed, 11 insertions, 7 deletions
diff --git a/config/deploy.rb b/config/deploy.rb
index afc586ecf..c1954d058 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -33,14 +33,12 @@ namespace :xapian do
end
namespace :deploy do
- desc "Restarting mod_rails with restart.txt"
- task :restart, :roles => :app, :except => { :no_release => true } do
- run "touch #{current_path}/tmp/restart.txt"
- end
- [:start, :stop].each do |t|
- desc "#{t} task is a no-op with mod_rails"
- task t, :roles => :app do ; end
+ [:start, :stop, :restart].each do |t|
+ desc "#{t.to_s.capitalize} Alaveteli service defined in /etc/init.d/alaveteli"
+ task t, :roles => :app, :except => { :no_release => true } do
+ run "/etc/init.d/alaveteli #{t}"
+ end
end
desc 'Link configuration after a code update'
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 1a56df2ae..e897c8452 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -29,6 +29,12 @@
</p>
This is the anti-spam honeypot.
* The workaround for an old [bug](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637239) in libc6 in squeeze has been removed. If you're running on squeeze, please make sure you're using the latest version of libc6 (2.11.3-4) to prevent the risk of segfaults.
+* The capistrano `stop`, `start` and `restart` tasks now restart the app
+ server via the service `/etc/init.d/alaveteli`. If you're using
+ capistrano for deployment, make sure `/etc/init.d/alaveteli` exists
+ and is current, and executable by the cap user. You can create it using the template
+ `config/sysvinit-thin.ugly` or `config/sysvinit-passenger.ugly` as
+ described in http://alaveteli.org/docs/installing/manual_install/#generate-alaveteli-service
# Version 0.18