From a3ec5dce2bcc7b346acd7a507821dc2bc105fbac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= Date: Thu, 8 Nov 2018 13:11:19 +0100 Subject: [PATCH] gitlab-shell: don't hardcode gitlab-shell paths in authorized_keys --- .../gitlab-shell/remove-hardcoded-locations.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 6d29f5f9e6c5..3d381404c63b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -43,3 +43,16 @@ index 57c70f5..700569b 100644 end def api +diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb +index 0600a18..6814f0a 100644 +--- a/lib/gitlab_keys.rb ++++ b/lib/gitlab_keys.rb +@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength + attr_accessor :auth_file, :key + + def self.command(whatever) +- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" ++ "/run/current-system/sw/bin/gitlab-shell #{whatever}" + end + + def self.command_key(key_id)