8 files changed, 16 insertions, 13 deletions
diff --git a/config/application.rb b/config/application.rb
index 366077795..3c01e26c4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -115,6 +115,7 @@ module Alaveteli
                                  'admin.css',
                                  'ie6.css',
                                  'ie7.css',
+                                 'bootstrap-dropdown.js',
                                  'responsive/print.css',
                                  'responsive/application-lte-ie7.css',
                                  'responsive/application-ie8.css']
diff --git a/config/crontab-example b/config/crontab-example
index 44e328e4e..f65555b11 100644
--- a/config/crontab-example
+++ b/config/crontab-example
@@ -21,6 +21,7 @@ MAILTO=!!(*= $mailto *)!!
 31 * * * * root !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/load-mail-server-logs.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/load-mail-server-logs || echo "stalled?"
 
 # Once a day, early morning
+31 1 * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/change-xapian-database.lock "!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/compact-xapian-database production !!(*= $site *)!!" || echo "stalled?"
 23 4 * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/delete-old-things.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/delete-old-things || echo "stalled?"
 0 6 * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/alert-overdue-requests.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/alert-overdue-requests || echo "stalled?"
 0 7 * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/alert-new-response-reminders.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/alert-new-response-reminders || echo "stalled?"
@@ -29,10 +30,6 @@ MAILTO=!!(*= $mailto *)!!
 45 3 * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/stop-new-responses-on-old-requests.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/stop-new-responses-on-old-requests || echo "stalled?"
 55 4 * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/update-public-body-stats.lock !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/update-public-body-stats || echo "stalled?"
 
-# Only root can restart apache
-31 1 * * * root !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/commonlib/bin/run-with-lockfile.sh -n !!(*= $vhost_dir *)!!/change-xapian-database.lock "!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/compact-xapian-database production" || echo "stalled?"
-
-
 # Once a day on all servers
 43 2 * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/request-creation-graph
 48 2 * * * !!(*= $user *)!! !!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/user-use-graph
diff --git a/config/deploy.rb b/config/deploy.rb
index c1954d058..f4a0b536a 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -14,6 +14,7 @@ set :deploy_to, configuration['deploy_to']
 set :user, configuration['user']
 set :use_sudo, false
 set :rails_env, configuration['rails_env']
+set :daemon_name, configuration.fetch('daemon_name', 'alaveteli')
 
 server configuration['server'], :app, :web, :db, :primary => true
 
@@ -35,9 +36,9 @@ end
 namespace :deploy do
 
   [:start, :stop, :restart].each do |t|
-    desc "#{t.to_s.capitalize} Alaveteli service defined in /etc/init.d/alaveteli"
+    desc "#{t.to_s.capitalize} Alaveteli service defined in /etc/init.d/"
     task t, :roles => :app, :except => { :no_release => true } do
-      run "/etc/init.d/alaveteli #{t}"
+      run "service #{ daemon_name } #{ t }"
     end
   end
 
diff --git a/config/deploy.yml.example b/config/deploy.yml.example
index a20eb3c22..93aba439a 100644
--- a/config/deploy.yml.example
+++ b/config/deploy.yml.example
@@ -6,6 +6,7 @@ production:
   user: deploy
   rails_env: production
   deploy_to: /srv/www/alaveteli_production
+  daemon_name: alaveteli
 staging:
   repository: git://github.com/mysociety/alaveteli.git
   branch: develop
@@ -13,3 +14,4 @@ staging:
   user: deploy
   rails_env: production
   deploy_to: /srv/www/alaveteli_staging
+  daemon_name: alaveteli_staging
diff --git a/config/general.yml-example b/config/general.yml-example
index 1f126c5a5..8acea374b 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -416,7 +416,7 @@ READ_ONLY: ''
 #   STAGING_SITE: 0
 #
 # ---
-STAGING_SITE: 0
+STAGING_SITE: 1
 
 # Recaptcha, for detecting humans. Get keys here:
 # http://recaptcha.net/whyrecaptcha.html
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index d2096fd52..e5ca9519e 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@ load "debug_helpers.rb"
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.20.0.14'
+ALAVETELI_VERSION = '0.21.0.4'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):
@@ -53,8 +53,6 @@ require 'theme'
 require 'xapian_queries'
 require 'date_quarter'
 require 'public_body_csv'
-require 'category_and_heading_migrator'
-require 'public_body_categories'
 require 'routing_filters'
 require 'alaveteli_text_masker'
 
diff --git a/config/initializers/missing_source_file.rb b/config/initializers/missing_source_file.rb
deleted file mode 100644
index a114fa972..000000000
--- a/config/initializers/missing_source_file.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# For Rails 2.3 on Ruby 1.9.3 @see https://github.com/rails/rails/pull/3745
-MissingSourceFile::REGEXPS << [/^cannot load such file -- (.+)$/i, 1]
diff --git a/config/sysvinit-thin.ugly b/config/sysvinit-thin.ugly
index b333f3738..0155ff8c3 100755
--- a/config/sysvinit-thin.ugly
+++ b/config/sysvinit-thin.ugly
@@ -22,7 +22,13 @@ RAILS_ENV=!!(*= $rails_env *)!!
 set -e
 
 # Check that the Daemon can be run
-su -l -c "cd $SITE_HOME && bundle exec thin --version &> /dev/null || exit 0" $USER
+CURRENT_USER=$(whoami)
+if [ "$CURRENT_USER" = "$USER" ]
+  then
+    cd $SITE_HOME && bundle exec thin --version > /dev/null 2>&1 || exit 0
+  else
+    su -l -c "cd $SITE_HOME && bundle exec thin --version &> /dev/null || exit 0" $USER
+fi
 
 start_daemon() {
   echo -n "Starting $DESC: "