3 files changed, 36 insertions, 10 deletions
diff --git a/config/deploy.rb b/config/deploy.rb
index a0189c855..c73d16f53 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -17,14 +17,13 @@ set :rails_env, configuration['rails_env']
 
 server configuration['server'], :app, :web, :db, :primary => true
 
-namespace :rake do
-  namespace :themes do
-    task :install do
-      run "cd #{latest_release} && bundle exec rake themes:install RAILS_ENV=#{rails_env}"
-    end
+namespace :themes do
+  task :install do
+    run "cd #{latest_release} && bundle exec rake themes:install RAILS_ENV=#{rails_env}"
   end
 end
 
+
 # Not in the rake namespace because we're also specifying app-specific arguments here
 namespace :xapian do
   desc 'Rebuilds the Xapian index as per the ./scripts/rebuild-xapian-index script'
@@ -55,7 +54,6 @@ namespace :deploy do
       "#{release_path}/config/aliases" => "#{shared_path}/aliases",
       "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png",
       "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png",
-      "#{release_path}/public/favicon.ico" => "#{shared_path}/favicon.ico",
       "#{release_path}/files" => "#{shared_path}/files",
       "#{release_path}/cache" => "#{shared_path}/cache",
       "#{release_path}/lib/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs",
@@ -72,8 +70,8 @@ namespace :deploy do
   end
 end
 
-after 'deploy:update_code', 'deploy:symlink_configuration'
-after 'deploy:update_code', 'rake:themes:install'
+before 'deploy:assets:precompile', 'deploy:symlink_configuration'
+before 'deploy:assets:precompile', 'themes:install'
 
 # Put up a maintenance notice if doing a migration which could take a while
 before 'deploy:migrate', 'deploy:web:disable'
diff --git a/config/general.yml-example b/config/general.yml-example
index b8d9fc854..2bead2021 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -214,3 +214,32 @@ USE_MAILCATCHER_IN_DEVELOPMENT: true
 # only have an effect in environments where
 # config.action_controller.perform_caching is set to true
 CACHE_FRAGMENTS: true
+
+# In some deployments of Alaveteli you may wish to install each newly
+# deployed version alongside the previous ones, in which case certain
+# files and resources should be shared between these installations:
+# for example, the 'files' directory, the 'cache' directory and the
+# generated graphs such as 'public/foi-live-creation.png'.  If you're
+# installing Alaveteli in such a setup then set SHARED_FILES_PATH to
+# the directory you're keeping these files under.  Otherwise, leave it
+# blank.
+SHARED_FILES_PATH: ''
+
+# If you have SHARED_FILES_PATH set, then these options list the files
+# and directories that are shared; i.e. those that the deploy scripts
+# should create symlinks to from the repository.
+SHARED_FILES:
+ - config/database.yml
+ - config/general.yml
+ - config/rails_env.rb
+ - config/newrelic.yml
+ - config/httpd.conf
+ - public/foi-live-creation.png
+ - public/foi-user-use.png
+ - config/aliases
+SHARED_DIRECTORIES:
+ - files/
+ - cache/
+ - lib/acts_as_xapian/xapiandbs/
+ - vendor/bundle
+ - public/assets
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index 4b6cf8e8c..6df1823a5 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.15'
+ALAVETELI_VERSION = '0.16'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):
@@ -50,7 +50,6 @@ require 'normalize_string'
 require 'alaveteli_file_types'
 require 'alaveteli_localization'
 require 'message_prominence'
-require 'actionmailer_patches'
 require 'theme'
 require 'xapian_queries'