Download as
Browse Code »

Commit cb04bdaf63911c5447bcde2e4feed2e93b585a61

Authored by Jacob Vosmaer
2 parents 86f2f852 3cceb32c
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 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 'redis_fixes' into 'master' 

Redis Fixes
Showing 3 changed files with 2 additions and 2 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
  Diff comments   View file @cb04bda
@@ -69,6 +69,7 @@ module GitLab @@ -69,6 +69,7 @@ module GitLab
69 results = { "gitlab" => {} } 69 results = { "gitlab" => {} }
70 [ 70 [
71 "bootstrap", 71 "bootstrap",
  72 + "redis",
72 "postgresql" 73 "postgresql"
73 ].each do |key| 74 ].each do |key|
74 rkey = key.gsub('_', '-') 75 rkey = key.gsub('_', '-')
files/gitlab-cookbooks/gitlab/recipes/redis.rb
  Diff comments   View file @cb04bda
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 # 16 #
17 17
18 redis_dir = node['gitlab']['redis']['dir'] 18 redis_dir = node['gitlab']['redis']['dir']
19 -redis_data_dir = node['gitlab']['redis']['data_dir']  
20 redis_log_dir = node['gitlab']['redis']['log_directory'] 19 redis_log_dir = node['gitlab']['redis']['log_directory']
21 20
22 user node['gitlab']['redis']['username'] do 21 user node['gitlab']['redis']['username'] do
files/gitlab-cookbooks/gitlab/recipes/redis_disable.rb
  Diff comments   View file @cb04bda
@@ -15,6 +15,6 @@ @@ -15,6 +15,6 @@
15 # limitations under the License. 15 # limitations under the License.
16 # 16 #
17 17
18 -runit_service "postgresql" do 18 +runit_service "redis" do
19 action :disable 19 action :disable
20 end 20 end