Download as
Browse Code »

Commit 1064b242fa9cffe6814102f14438e44d571176c2

Authored by Jacob Vosmaer
2 parents a3796291 4cb490c4
Exists in master and in 11 other branches 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'cache_clear' into 'master' 

Clear the Rails cache after modifying gitlab.yml
Showing 2 changed files with 7 additions and 0 deletions   Show diff stats
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 - Enable the 'sign_in_text' field in gitlab.yml (Mike Nestor) 10 - Enable the 'sign_in_text' field in gitlab.yml (Mike Nestor)
11 - Use more fancy SSL ciphers for Nginx 11 - Use more fancy SSL ciphers for Nginx
12 - Use sane LDAP defaults 12 - Use sane LDAP defaults
  13 +- Clear the Rails cache after modifying gitlab.yml
13 14
14 6.8.1 15 6.8.1
15 - Use gitlab-rails 6.8.1 16 - Use gitlab-rails 6.8.1
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
  Diff comments   View file @1064b24
@@ -83,6 +83,7 @@ template_symlink File.join(gitlab_rails_etc_dir, "gitlab.yml") do @@ -83,6 +83,7 @@ template_symlink File.join(gitlab_rails_etc_dir, "gitlab.yml") do
83 mode "0644" 83 mode "0644"
84 variables(node['gitlab']['gitlab-rails'].to_hash) 84 variables(node['gitlab']['gitlab-rails'].to_hash)
85 restarts dependent_services 85 restarts dependent_services
  86 + notifies :run, "execute[clear the gitlab-rails cache]"
86 end 87 end
87 88
88 template_symlink File.join(gitlab_rails_etc_dir, "rack_attack.rb") do 89 template_symlink File.join(gitlab_rails_etc_dir, "rack_attack.rb") do
@@ -114,3 +115,8 @@ end @@ -114,3 +115,8 @@ end
114 end 115 end
115 116
116 execute "chown -R #{node['gitlab']['user']['username']} /opt/gitlab/embedded/service/gitlab-rails/public" 117 execute "chown -R #{node['gitlab']['user']['username']} /opt/gitlab/embedded/service/gitlab-rails/public"
  118 +
  119 +execute "clear the gitlab-rails cache" do
  120 + command "/opt/gitlab/bin/gitlab-rake cache:clear"
  121 + action :nothing
  122 +end