Skip to content
Snippets Groups Projects
Verified Commit 44654a55 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis Committed by GitLab
Browse files

Merge branch 'omit-nginx-enable-ref-arch' into 'master'

Omit extra nginx enablement in ref arch

See merge request !162811



Merged-by: default avatarAchilleas Pipinellis <axil@gitlab.com>
Approved-by: default avatarNailia Iskhakova <niskhakova@gitlab.com>
Approved-by: default avatarAchilleas Pipinellis <axil@gitlab.com>
Reviewed-by: default avatarBen Bodenmiller <bbodenmiller@gmail.com>
Reviewed-by: default avatarNailia Iskhakova <niskhakova@gitlab.com>
Co-authored-by: default avatarBen Bodenmiller <bbodenmiller@gmail.com>
parents 31daf9be 51ecec3b
No related branches found
No related tags found
1 merge request!162811Omit extra nginx enablement in ref arch
Pipeline #1443010448 passed
...@@ -1953,7 +1953,6 @@ On each node perform the following: ...@@ -1953,7 +1953,6 @@ On each node perform the following:
## Disable components that will not be on the GitLab application server ## Disable components that will not be on the GitLab application server
roles(['application_role']) roles(['application_role'])
gitaly['enable'] = false gitaly['enable'] = false
nginx['enable'] = true
sidekiq['enable'] = false sidekiq['enable'] = false
## PostgreSQL connection details ## PostgreSQL connection details
......
...@@ -1961,7 +1961,6 @@ On each node perform the following: ...@@ -1961,7 +1961,6 @@ On each node perform the following:
## Disable components that will not be on the GitLab application server ## Disable components that will not be on the GitLab application server
roles(['application_role']) roles(['application_role'])
gitaly['enable'] = false gitaly['enable'] = false
nginx['enable'] = true
sidekiq['enable'] = false sidekiq['enable'] = false
## PostgreSQL connection details ## PostgreSQL connection details
......
...@@ -787,7 +787,6 @@ On each node perform the following: ...@@ -787,7 +787,6 @@ On each node perform the following:
## Disable components that will not be on the GitLab application server ## Disable components that will not be on the GitLab application server
roles(['application_role']) roles(['application_role'])
gitaly['enable'] = false gitaly['enable'] = false
nginx['enable'] = true
sidekiq['enable'] = false sidekiq['enable'] = false
## PostgreSQL connection details ## PostgreSQL connection details
......
...@@ -1794,7 +1794,6 @@ On each node perform the following: ...@@ -1794,7 +1794,6 @@ On each node perform the following:
## Disable components that will not be on the GitLab application server ## Disable components that will not be on the GitLab application server
roles(['application_role']) roles(['application_role'])
gitaly['enable'] = false gitaly['enable'] = false
nginx['enable'] = true
sidekiq['enable'] = false sidekiq['enable'] = false
## PostgreSQL connection details ## PostgreSQL connection details
......
...@@ -1978,7 +1978,6 @@ On each node perform the following: ...@@ -1978,7 +1978,6 @@ On each node perform the following:
## Disable components that will not be on the GitLab application server ## Disable components that will not be on the GitLab application server
roles(['application_role']) roles(['application_role'])
gitaly['enable'] = false gitaly['enable'] = false
nginx['enable'] = true
sidekiq['enable'] = false sidekiq['enable'] = false
## PostgreSQL connection details ## PostgreSQL connection details
......
...@@ -1791,7 +1791,6 @@ On each node perform the following: ...@@ -1791,7 +1791,6 @@ On each node perform the following:
## Disable components that will not be on the GitLab application server ## Disable components that will not be on the GitLab application server
roles(['application_role']) roles(['application_role'])
gitaly['enable'] = false gitaly['enable'] = false
nginx['enable'] = true
sidekiq['enable'] = false sidekiq['enable'] = false
## PostgreSQL connection details ## PostgreSQL connection details
......
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