Commit 154623df authored by Jason Tevnan's avatar Jason Tevnan Committed by Marin Jankovski

Seperate guard attribute from package attribute

parent 4dcc7781
......@@ -19,7 +19,8 @@ See packages.gitlab.com/gitlab/gitlab-ce.
- `node['omnibus-gitlab']['package']['repo']` defaults to `gitlab/gitlab-ce`. Use `gitlab/gitlab-ee` for GitLab Enterprise Edition
- `node['omnibus-gitlab']['package']['name']` defaults to `gitlab-ce`. Use `gitlab-ee` for GitLab Enterprise Edition
- `node['omnibus-gitlab']['skip_auto_migrations']` defaults to `false`. This option will create a file (`/etc/gitlab/skip-auto-migrations`) which will tell the package not to run `gitlab-ctl reconfigure` as well as telling the chef recipe to skip the `gitlab-ctl reconfigure` step. This is useful when dealing with DB/Redis servers which should not be restarted automatically.
- `node['omnibus-gitlab']['skip_auto_migrations']` defaults to `false`. This option will create a file (`/etc/gitlab/skip-auto-migrations`) which will tell the package not to run `gitlab-ctl reconfigure`.
- `node['omnibus-gitlab']['run_reconfigure']` defaults to `true`. This option will tell chef to run `gitlab-ctl reconfigure`. Setting it to `false` is useful when dealing with DB/Redis servers which should not be restarted automatically.
For more available attributes see `attributes/default.rb`.
......
......@@ -31,7 +31,10 @@ default['omnibus-gitlab']['ssl']['pages_private_key'] = ''
default['omnibus-gitlab']['ssl']['registry_certificate'] = ''
default['omnibus-gitlab']['ssl']['registry_private_key'] = ''
# dont trigger reconfigue in the package
default['omnibus-gitlab']['skip_auto_migrations'] = false
# dont trigger reconfigue via chef
default['omnibus-gitlab']['run_reconfigure'] = true
default['omnibus-gitlab']['munin_sidekiq_postreceive']['window_size'] = 100
......
......@@ -4,7 +4,7 @@ maintainer_email 'marin@gitlab.com'
license 'All rights reserved'
description 'Installs/Configures GitLab using omnibus-gitlab'
long_description 'Installs/Configures GitLab using omnibus-gitlab'
version '0.3.18'
version '0.3.19'
issues_url 'https://gitlab.com/gitlab-org/cookbook-omnibus-gitlab/issues'
source_url 'https://gitlab.com/gitlab-org/cookbook-omnibus-gitlab/'
......
......@@ -128,7 +128,7 @@ end
# Run gitlab-ctl reconfigure if /etc/gitlab/gitlab.rb changed
execute 'gitlab-ctl reconfigure' do
action :nothing
not_if { node['omnibus-gitlab']['skip_auto_migrations'] }
only_if { node['omnibus-gitlab']['run_reconfigure'] }
end
# Reload NGINX if the SSL certificate or key has changed
......
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