Merge branch 'clean-up-install-from-source-gitlab-shell' into 'master'

Clean up gitlab-shell install-from-source instructions

See merge request gitlab-org/gitlab!33057

.gitlab/ci/frontend.gitlab-ci.yml

@@ -21,7 +21,6 @@
     NODE_ENV: "production"
     RAILS_ENV: "production"
     SETUP_DB: "false"
-    SKIP_STORAGE_VALIDATION: "true"
     WEBPACK_REPORT: "true"
     # we override the max_old_space_size to prevent OOM errors
     NODE_OPTIONS: --max_old_space_size=3584

.gitlab/ci/memory.gitlab-ci.yml

@@ -44,7 +44,6 @@ memory-on-boot:
     NODE_ENV: "production"
     RAILS_ENV: "production"
     SETUP_DB: "true"
-    SKIP_STORAGE_VALIDATION: "true"
     # we override the max_old_space_size to prevent OOM errors
     NODE_OPTIONS: --max_old_space_size=3584
   script:

changelogs/unreleased/clean-up-install-from-source-gitlab-shell.yml

+---
+title: Clean up gitlab-shell install-from-source path
+merge_request: 33057
+author:
+type: changed

doc/install/installation.md

@@ -216,10 +216,9 @@ The Ruby interpreter is required to run GitLab.
   dropped support for Ruby 2.5.x.
 
 The use of Ruby version managers such as [RVM](https://rvm.io/), [rbenv](https://github.com/rbenv/rbenv) or [chruby](https://github.com/postmodern/chruby) with GitLab
-in production, frequently leads to hard to diagnose problems. For example,
-GitLab Shell is called from OpenSSH, and having a version manager can prevent
-pushing and pulling over SSH. Version managers are not supported and we strongly
-advise everyone to follow the instructions below to use a system Ruby.
+in production, frequently leads to hard to diagnose problems. Version managers
+are not supported and we strongly advise everyone to follow the instructions
+below to use a system Ruby.
 
 Linux distributions generally have older versions of Ruby available, so these
 instructions are designed to install Ruby from the official source code.
@@ -565,8 +564,8 @@ If you want to use Kerberos for user authentication, omit `kerberos` in the `--w
 GitLab Shell is an SSH access and repository management software developed specially for GitLab.
 
 ```shell
-# Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
-sudo -u git -H bundle exec rake gitlab:shell:install REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production SKIP_STORAGE_VALIDATION=true
+# Run the installation task for gitlab-shell:
+sudo -u git -H bundle exec rake gitlab:shell:install RAILS_ENV=production
 
 # By default, the gitlab-shell config is generated from your main GitLab config.
 # You can review (and modify) the gitlab-shell config as follows:
@@ -579,13 +578,6 @@ If you want to use HTTPS, see [Using HTTPS](#using-https) for the additional ste
 NOTE: **Note:**
 Make sure your hostname can be resolved on the machine itself by either a proper DNS record or an additional line in `/etc/hosts` ("127.0.0.1 hostname"). This might be necessary, for example, if you set up GitLab behind a reverse proxy. If the hostname cannot be resolved, the final installation check will fail with `Check GitLab API access: FAILED. code: 401` and pushing commits will be rejected with `[remote rejected] master -> master (hook declined)`.
 
-NOTE: **Note:**
-GitLab Shell application startup time can be greatly reduced by disabling RubyGems. This can be done in several ways:
-
-- Export `RUBYOPT=--disable-gems` environment variable for the processes.
-- Compile Ruby with `configure --disable-rubygems` to disable RubyGems by default. Not recommended for system-wide Ruby.
-- Omnibus GitLab [replaces the *shebang* line of the `gitlab-shell/bin/*` scripts](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/1707).
-
 ### Install GitLab Workhorse
 
 GitLab-Workhorse uses [GNU Make](https://www.gnu.org/software/make/). The

lib/tasks/gitlab/shell.rake

@@ -21,25 +21,12 @@ namespace :gitlab do
           gitlab_url: gitlab_url,
           http_settings: { self_signed_cert: false }.stringify_keys,
           auth_file: File.join(user_home, ".ssh", "authorized_keys"),
-          redis: {
-            bin: `which redis-cli`.chomp,
-            namespace: "resque:gitlab"
-          }.stringify_keys,
           log_level: "INFO",
           audit_usernames: false
         }.stringify_keys
 
-        redis_url = URI.parse(ENV['REDIS_URL'] || "redis://localhost:6379")
-
-        if redis_url.scheme == 'unix'
-          config['redis']['socket'] = redis_url.path
-        else
-          config['redis']['host'] = redis_url.host
-          config['redis']['port'] = redis_url.port
-        end
-
         # Generate config.yml based on existing gitlab settings
-        File.open("config.yml", "w+") {|f| f.puts config.to_yaml}
+        File.open("config.yml", "w+") {|f| f.puts config.to_yaml }
 
         [
           %w(bin/install) + repository_storage_paths_args,