diff options
| author | Nick Thomas <nick@gitlab.com> | 2020-10-01 09:45:40 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2020-10-01 09:45:40 +0000 |
| commit | b7496bb8cdfda7692e447b46a4eaf967ba13b748 (patch) | |
| tree | fe00b1697a94a84e59ac3aadcda2ba44a43fc1e9 | |
| parent | 1a2bfecd2f0ebb8e31f9833e0522c4643797041b (diff) | |
| parent | 6cef08511b8c830fcb67879118e4be8747f07cc6 (diff) | |
| download | gitlab-shell-b7496bb8cdfda7692e447b46a4eaf967ba13b748.tar.gz | |
Merge branch 'zj-config-secret' into 'master'
config: Set a secret example
See merge request gitlab-org/gitlab-shell!415
| -rw-r--r-- | config.yml.example | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config.yml.example b/config.yml.example index 6689ca8..645cb88 100644 --- a/config.yml.example +++ b/config.yml.example @@ -38,6 +38,10 @@ auth_file: "/home/git/.ssh/authorized_keys" # File that contains the secret key for verifying access to GitLab. # Default is .gitlab_shell_secret in the gitlab-shell directory. # secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret" +# +# The secret field supersedes the secret_file, and if set that +# file will not be read. +# secret: "supersecret" # Log file. # Default is gitlab-shell.log in the root directory. |