diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2015-02-16 13:16:26 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2015-05-16 21:46:06 +0200 |
| commit | ed3298fc019d224b9048901972ac03e5272a3b25 (patch) | |
| tree | bbdaea24522778869f106fdfe99f691feb8ccbc7 /config/initializers/gitlab_shell_secret_token.rb | |
| parent | 35729671fb3a123ddeb7b2b1cda446fd661bd4e6 (diff) | |
| download | gitlab-ce-ed3298fc019d224b9048901972ac03e5272a3b25.tar.gz | |
Allow to configure gitlab_shell_secret location
Diffstat (limited to 'config/initializers/gitlab_shell_secret_token.rb')
| -rw-r--r-- | config/initializers/gitlab_shell_secret_token.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/initializers/gitlab_shell_secret_token.rb b/config/initializers/gitlab_shell_secret_token.rb index e7c9f0ba7c2..751fccead07 100644 --- a/config/initializers/gitlab_shell_secret_token.rb +++ b/config/initializers/gitlab_shell_secret_token.rb @@ -5,8 +5,7 @@ require 'securerandom' # Your secret key for verifying the gitlab_shell. -secret_file = Rails.root.join('.gitlab_shell_secret') -gitlab_shell_symlink = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret') +secret_file = Gitlab.config.gitlab_shell.secret_file unless File.exist? secret_file # Generate a new token of 16 random hexadecimal characters and store it in secret_file. @@ -14,6 +13,7 @@ unless File.exist? secret_file File.write(secret_file, token) end -if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(gitlab_shell_symlink) - FileUtils.symlink(secret_file, gitlab_shell_symlink) +link_path = File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret') +if File.exist?(Gitlab.config.gitlab_shell.path) && !File.exist?(link_path) + FileUtils.symlink(secret_file, link_path) end |