Commit cb04bdaf63911c5447bcde2e4feed2e93b585a61

Authored by Jacob Vosmaer
2 parents 86f2f852 3cceb32c

Merge branch 'redis_fixes' into 'master'

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