summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2015-02-08 22:44:25 +0100
committerJakub Jirutka <jakub@jirutka.cz>2015-02-08 22:46:57 +0100
commit9beb1c49fc2e708d5291420f39771264e89d9328 (patch)
tree5d6e54bd0d613c470fda7067b7a4fffdbe25655b /lib
parent6d23be22d907ad8328169d36712ea36d36107b93 (diff)
downloadgitlab-shell-9beb1c49fc2e708d5291420f39771264e89d9328.tar.gz
Allow to configure location of the secret file
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab_config.rb4
-rw-r--r--lib/gitlab_net.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index c97743b..1d8c690 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -19,6 +19,10 @@ class GitlabConfig
@config['auth_file'] ||= File.join(home, ".ssh/authorized_keys")
end
+ def secret_file
+ @config['secret_file'] ||= File.join(ROOT_PATH, '.gitlab_shell_secret')
+ end
+
def gitlab_url
@config['gitlab_url'] ||= "http://localhost/"
end
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index c178927..bc9339b 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -125,6 +125,6 @@ class GitlabNet
end
def secret_token
- @secret_token ||= File.read File.join(ROOT_PATH, '.gitlab_shell_secret')
+ @secret_token ||= File.read config.secret_file
end
end