diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-15 15:37:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-15 15:37:31 +0000 |
| commit | b7ce0ac24162d9fa14749b0adf1020668ad45c22 (patch) | |
| tree | 2c9610a4b48c70c2d835678381aee20067687896 | |
| parent | d7f70b77a8a63e003742b5d3fe3d4e8841a76c9f (diff) | |
| parent | 87a36a74ff0e011a69d49f4b2411cae17f975ca9 (diff) | |
| download | gitlab-ce-b7ce0ac24162d9fa14749b0adf1020668ad45c22.tar.gz | |
Merge branch '38540-ssh-env-file' into 'master'
Resolve "rake gitlab:shell:install creates ~git/.ssh/environment which gitlab:check complains about"
Closes #38540
See merge request gitlab-org/gitlab-ce!16114
| -rw-r--r-- | changelogs/unreleased/38540-ssh-env-file.yml | 6 | ||||
| -rw-r--r-- | lib/tasks/gitlab/shell.rake | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/changelogs/unreleased/38540-ssh-env-file.yml b/changelogs/unreleased/38540-ssh-env-file.yml new file mode 100644 index 00000000000..5ada0ede76d --- /dev/null +++ b/changelogs/unreleased/38540-ssh-env-file.yml @@ -0,0 +1,6 @@ +--- +title: 'Closes #38540 - Remove .ssh/environment file that now breaks the gitlab:check + rake task' +merge_request: +author: +type: fixed diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake index 0e6aed32c52..12ae4199b69 100644 --- a/lib/tasks/gitlab/shell.rake +++ b/lib/tasks/gitlab/shell.rake @@ -54,16 +54,6 @@ namespace :gitlab do # (Re)create hooks Rake::Task['gitlab:shell:create_hooks'].invoke - # Required for debian packaging with PKGR: Setup .ssh/environment with - # the current PATH, so that the correct ruby version gets loaded - # Requires to set "PermitUserEnvironment yes" in sshd config (should not - # be an issue since it is more than likely that there are no "normal" - # user accounts on a gitlab server). The alternative is for the admin to - # install a ruby (1.9.3+) in the global path. - File.open(File.join(user_home, ".ssh", "environment"), "w+") do |f| - f.puts "PATH=#{ENV['PATH']}" - end - Gitlab::Shell.ensure_secret_token! end |