diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 671b431aeb7f67df5f5f1a70f0befdc9c348c7dc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..3df11d7cdf082761f80291835a518e04ec04825d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -28,7 +28,7 @@ default['gitlab']['manage_storage_directories']['manage_etc'] = true # A tmpfs mount point directory for runtime files, actual default is located in libraries/gitlab_rails.rb. -default['gitlab']['runtime-dir'] = nil +default['gitlab']['runtime_dir'] = nil #### # The Git User that services run as diff --git a/files/gitlab-cookbooks/gitlab/recipes/puma.rb b/files/gitlab-cookbooks/gitlab/recipes/puma.rb index 671b431aeb7f67df5f5f1a70f0befdc9c348c7dc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy9wdW1hLnJi..3df11d7cdf082761f80291835a518e04ec04825d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVjaXBlcy9wdW1hLnJi 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/puma.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/puma.rb @@ -20,7 +20,7 @@ logfiles_helper = LogfilesHelper.new(node) logging_settings = logfiles_helper.logging_settings('puma') -metrics_dir = File.join(node['gitlab']['runtime-dir'].to_s, 'gitlab/puma') unless node['gitlab']['runtime-dir'].nil? +metrics_dir = File.join(node['gitlab']['runtime_dir'].to_s, 'gitlab/puma') unless node['gitlab']['runtime_dir'].nil? svc = 'puma' user = account_helper.gitlab_user diff --git a/files/gitlab-cookbooks/gitlab/resources/sidekiq_service.rb b/files/gitlab-cookbooks/gitlab/resources/sidekiq_service.rb index 671b431aeb7f67df5f5f1a70f0befdc9c348c7dc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVzb3VyY2VzL3NpZGVraXFfc2VydmljZS5yYg==..3df11d7cdf082761f80291835a518e04ec04825d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvcmVzb3VyY2VzL3NpZGVraXFfc2VydmljZS5yYg== 100644 --- a/files/gitlab-cookbooks/gitlab/resources/sidekiq_service.rb +++ b/files/gitlab-cookbooks/gitlab/resources/sidekiq_service.rb @@ -19,7 +19,7 @@ user = new_resource.user group = new_resource.group - metrics_dir = ::File.join(node['gitlab']['runtime-dir'].to_s, "gitlab/#{svc}") unless node['gitlab']['runtime-dir'].nil? + metrics_dir = ::File.join(node['gitlab']['runtime_dir'].to_s, "gitlab/#{svc}") unless node['gitlab']['runtime_dir'].nil? sidekiq_log_dir = new_resource.log_directory sidekiq_log_user = new_resource.log_user diff --git a/files/gitlab-cookbooks/package/libraries/settings_dsl.rb b/files/gitlab-cookbooks/package/libraries/settings_dsl.rb index 671b431aeb7f67df5f5f1a70f0befdc9c348c7dc_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9zZXR0aW5nc19kc2wucmI=..3df11d7cdf082761f80291835a518e04ec04825d_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9zZXR0aW5nc19kc2wucmI= 100644 --- a/files/gitlab-cookbooks/package/libraries/settings_dsl.rb +++ b/files/gitlab-cookbooks/package/libraries/settings_dsl.rb @@ -57,6 +57,7 @@ manage_storage_directories omnibus_gitconfig prometheus_monitoring + runtime_dir ].freeze def self.extended(base) diff --git a/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb b/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb index 671b431aeb7f67df5f5f1a70f0befdc9c348c7dc_c3BlYy9jaGVmL2Nvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9zZXR0aW5nc19kc2xfc3BlYy5yYg==..3df11d7cdf082761f80291835a518e04ec04825d_c3BlYy9jaGVmL2Nvb2tib29rcy9wYWNrYWdlL2xpYnJhcmllcy9zZXR0aW5nc19kc2xfc3BlYy5yYg== 100644 --- a/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb +++ b/spec/chef/cookbooks/package/libraries/settings_dsl_spec.rb @@ -53,6 +53,7 @@ %w[manage-storage-directories manage_storage_directories], %w[omnibus-gitconfig omnibus_gitconfig], %w[prometheus-monitoring prometheus_monitoring], + %w[runtime-dir runtime_dir], ].each do |input, output| expect(subject.sanitized_key(input)).to eq(output) end