Commit b7ce0ac2 authored by Douwe Maan's avatar Douwe Maan

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
parents d7f70b77 87a36a74
---
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 ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment