Commit ee5f0ffb authored by Ilya Frolov's avatar Ilya Frolov

Merge branch 'ilya-replace-reconfigure'

parents 2c861e12 db42de60
......@@ -35,7 +35,10 @@ default['omnibus-gitlab']['ssl']['registry_certificate'] = ''
default['omnibus-gitlab']['ssl']['registry_private_key'] = ''
# dont trigger reconfigue in the package
# NOTE: first being phased out, should be removed after all roles are moved to new one
# see https://gitlab.com/gitlab-com/infrastructure/issues/4073 for details
default['omnibus-gitlab']['skip_auto_migrations'] = false
default['omnibus-gitlab']['skip_auto_reconfigure'] = false
# dont trigger reconfigue via chef
default['omnibus-gitlab']['run_reconfigure'] = true
......
......@@ -4,7 +4,7 @@ maintainer_email 'marin@gitlab.com'
license 'MIT'
description 'Installs/Configures GitLab using omnibus-gitlab'
long_description 'Installs/Configures GitLab using omnibus-gitlab'
version '0.4.2'
version '0.4.3'
issues_url 'https://gitlab.com/gitlab-org/cookbook-omnibus-gitlab/issues'
source_url 'https://gitlab.com/gitlab-org/cookbook-omnibus-gitlab/'
chef_version '~> 12.0'
......
......@@ -63,8 +63,8 @@ template '/etc/gitlab/gitlab.rb' do
notifies :run, 'execute[gitlab-ctl reconfigure]'
end
file '/etc/gitlab/skip-auto-migrations' do
if node['omnibus-gitlab']['skip_auto_migrations']
file '/etc/gitlab/skip-auto-reconfigure' do
if node['omnibus-gitlab']['skip_auto_reconfigure'] || node['omnibus-gitlab']['skip_auto_migrations']
action :create
else
action :delete
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment