Skip to content
Snippets Groups Projects
Commit 04a88759 authored by Gabriel Mazetto's avatar Gabriel Mazetto
Browse files

Decouple some recipe instructions from gitlab cookbook

parent 878a333f
No related branches found
No related tags found
3 merge requests!51Validate shift of Heptapod 0.25 to oldstable series,!40Heptapod 0.22 is the new stable,!36GitLab 13.11
......@@ -122,5 +122,6 @@
# Postgresql depends on Redis because of `rake db:seed_fu`
# Gitaly and/or Praefect must be available before migrations
%w(
logrotate
redis
gitaly
......@@ -125,3 +126,4 @@
redis
gitaly
postgresql
praefect
......@@ -127,5 +129,4 @@
praefect
postgresql
gitlab-kas
).each do |service|
if node[service]['enable']
......@@ -137,12 +138,6 @@
include_recipe "gitlab::database_migrations" if node['gitlab']['gitlab-rails']['enable'] && !(node.key?('pgbouncer') && node['pgbouncer']['enable'])
include_recipe "praefect::database_migrations" if node['praefect']['enable'] && node['praefect']['auto_migrate']
# Always create logrotate folders and configs, even if the service is not enabled.
# https://gitlab.com/gitlab-org/omnibus-gitlab/issues/508
include_recipe "logrotate::folders_and_configs"
# Configure Services
%w[
unicorn
......@@ -170,8 +165,7 @@
end
%w(
logrotate
gitlab-pages
registry
mattermost
gitlab-kas
......@@ -174,7 +168,8 @@
gitlab-pages
registry
mattermost
gitlab-kas
letsencrypt
).each do |service|
if node[service]["enable"]
include_recipe "#{service}::enable"
......@@ -188,12 +183,6 @@
# Recipe which handles all prometheus related services
include_recipe "monitoring"
if node['letsencrypt']['enable']
include_recipe 'letsencrypt::enable'
else
include_recipe 'letsencrypt::disable'
end
if node['gitlab']['gitlab-rails']['database_reindexing']['enable']
include_recipe 'gitlab::database_reindexing_enable'
else
......
......@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
include_recipe "logrotate::folders_and_configs"
runit_service "logrotate" do
action :disable
......
......@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
include_recipe "logrotate::folders_and_configs"
runit_service "logrotate" do
start_down node['logrotate']['ha']
......
......@@ -92,3 +92,5 @@
socket_address node['praefect']['prometheus_listen_addr']
reload_service false unless node['consul']['enable']
end
include_recipe "praefect::database_migrations" if node['praefect']['auto_migrate']
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment