aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/deploy.rb1
-rw-r--r--config/general.yml-example6
2 files changed, 7 insertions, 0 deletions
diff --git a/config/deploy.rb b/config/deploy.rb
index 8f0f2c32d..5c7c181c9 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -53,6 +53,7 @@ namespace :deploy do
"#{release_path}/config/newrelic.yml" => "#{shared_path}/newrelic.yml",
"#{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}/vendor/plugins/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs",
diff --git a/config/general.yml-example b/config/general.yml-example
index 18e6cb998..1cceef38e 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -52,6 +52,12 @@ THEME_URLS:
- 'git://github.com/mysociety/adminbootstraptheme.git'
- 'git://github.com/mysociety/alavetelitheme.git'
+# When rails-post-deploy installs the themes it will try this branch first
+# (but only if this config is set). If the branch doesn't exist it will fall
+# back to using a tagged version specific to your installed alaveteli version.
+# If that doesn't exist it will back to master.
+THEME_BRANCH: false
+
# Whether a user needs to sign in to start the New Request process
FORCE_REGISTRATION_ON_NEW_REQUEST: false