Commit 94533788 authored by Evan Read's avatar Evan Read

Merge branch 'fix-gitaly-secret-spelling' into 'master'

Spell gitalysecret correctly

See merge request gitlab-org/gitlab!40912
parents 18ce1c5f 4590e7f9
...@@ -405,7 +405,7 @@ To configure the Gitaly server: ...@@ -405,7 +405,7 @@ To configure the Gitaly server:
# to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API. # to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API.
# The following two values must be the same as their respective values # The following two values must be the same as their respective values
# of the GitLab Rails application setup # of the GitLab Rails application setup
gitaly['auth_token'] = 'gitlaysecret' gitaly['auth_token'] = 'gitalysecret'
gitlab_shell['secret_token'] = 'shellsecret' gitlab_shell['secret_token'] = 'shellsecret'
# Avoid running unnecessary services on the Gitaly server # Avoid running unnecessary services on the Gitaly server
...@@ -586,7 +586,7 @@ On each node perform the following: ...@@ -586,7 +586,7 @@ On each node perform the following:
# to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API. # to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API.
# The following two values must be the same as their respective values # The following two values must be the same as their respective values
# of the Gitaly setup # of the Gitaly setup
gitlab_rails['gitaly_token'] = 'gitalyecret' gitlab_rails['gitaly_token'] = 'gitalysecret'
gitlab_shell['secret_token'] = 'shellsecret' gitlab_shell['secret_token'] = 'shellsecret'
git_data_dirs({ git_data_dirs({
......
...@@ -1131,7 +1131,7 @@ On each node: ...@@ -1131,7 +1131,7 @@ On each node:
# to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API. # to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API.
# The following two values must be the same as their respective values # The following two values must be the same as their respective values
# of the GitLab Rails application setup # of the GitLab Rails application setup
gitaly['auth_token'] = 'gitlaysecret' gitaly['auth_token'] = 'gitalysecret'
gitlab_shell['secret_token'] = 'shellsecret' gitlab_shell['secret_token'] = 'shellsecret'
# Avoid running unnecessary services on the Gitaly server # Avoid running unnecessary services on the Gitaly server
...@@ -1474,7 +1474,7 @@ On each node perform the following: ...@@ -1474,7 +1474,7 @@ On each node perform the following:
# to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API. # to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API.
# The following two values must be the same as their respective values # The following two values must be the same as their respective values
# of the Gitaly setup # of the Gitaly setup
gitlab_rails['gitaly_token'] = 'gitalyecret' gitlab_rails['gitaly_token'] = 'gitalysecret'
gitlab_shell['secret_token'] = 'shellsecret' gitlab_shell['secret_token'] = 'shellsecret'
git_data_dirs({ git_data_dirs({
......
...@@ -1130,7 +1130,7 @@ On each node: ...@@ -1130,7 +1130,7 @@ On each node:
# to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API. # to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API.
# The following two values must be the same as their respective values # The following two values must be the same as their respective values
# of the GitLab Rails application setup # of the GitLab Rails application setup
gitaly['auth_token'] = 'gitlaysecret' gitaly['auth_token'] = 'gitalysecret'
gitlab_shell['secret_token'] = 'shellsecret' gitlab_shell['secret_token'] = 'shellsecret'
# Avoid running unnecessary services on the Gitaly server # Avoid running unnecessary services on the Gitaly server
...@@ -1473,7 +1473,7 @@ On each node perform the following: ...@@ -1473,7 +1473,7 @@ On each node perform the following:
# to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API. # to Gitaly, and a second for authentication callbacks from GitLab-Shell to the GitLab internal API.
# The following two values must be the same as their respective values # The following two values must be the same as their respective values
# of the Gitaly setup # of the Gitaly setup
gitlab_rails['gitaly_token'] = 'gitalyecret' gitlab_rails['gitaly_token'] = 'gitalysecret'
gitlab_shell['secret_token'] = 'shellsecret' gitlab_shell['secret_token'] = 'shellsecret'
git_data_dirs({ git_data_dirs({
......
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