Merge branch '38540-ssh-env-file' into 'master'
Resolve "rake gitlab🐚install creates ~git/.ssh/environment which gitlab:check complains about" Closes #38540 See merge request gitlab-org/gitlab-ce!16114
This commit is contained in:
commit
b7ce0ac241
2 changed files with 6 additions and 10 deletions
6
changelogs/unreleased/38540-ssh-env-file.yml
Normal file
6
changelogs/unreleased/38540-ssh-env-file.yml
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
title: 'Closes #38540 - Remove .ssh/environment file that now breaks the gitlab:check
|
||||||
|
rake task'
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: fixed
|
|
@ -54,16 +54,6 @@ namespace :gitlab do
|
||||||
# (Re)create hooks
|
# (Re)create hooks
|
||||||
Rake::Task['gitlab:shell:create_hooks'].invoke
|
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!
|
Gitlab::Shell.ensure_secret_token!
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue