Merge branch 'remaining-lib-differences' into 'master'

Resolve remaining CE to EE differences in lib/

See merge request gitlab-org/gitlab-ce!26608

lib/tasks/gitlab/info.rake

@@ -14,6 +14,12 @@ namespace :gitlab do
       rake_version = run_and_match(%w(rake --version), /[\d\.]+/).try(:to_s)
       # check redis version
       redis_version = run_and_match(%w(redis-cli --version), /redis-cli (\d+\.\d+\.\d+)/).to_a
+
+      # check for system defined proxies
+      if Gitlab.ee?
+        proxies = Gitlab::Proxy.detect_proxy.map {|k, v| "#{k}: #{v}"}.join("\n\t\t")
+      end
+
       # check Git version
       git_version = run_and_match([Gitlab.config.git.bin_path, '--version'], /git version ([\d\.]+)/).to_a
       # check Go version
@@ -22,6 +28,11 @@ namespace :gitlab do
       puts ""
       puts "System information".color(:yellow)
       puts "System:\t\t#{os_name || "unknown".color(:red)}"
+
+      if Gitlab.ee?
+        puts "Proxy:\t\t#{proxies.present? ? proxies.color(:green) : "no"}"
+      end
+
       puts "Current User:\t#{run_command(%w(whoami))}"
       puts "Using RVM:\t#{rvm_version.present? ? "yes".color(:green) : "no"}"
       puts "RVM Version:\t#{rvm_version}" if rvm_version.present?
@@ -39,6 +50,15 @@ namespace :gitlab do
       http_clone_url = project.http_url_to_repo
       ssh_clone_url  = project.ssh_url_to_repo
+      if Gitlab.ee?
+        geo_node_type =
+          if Gitlab::Geo.current_node
+            Gitlab::Geo.current_node.primary ? 'Primary' : 'Secondary'
+          else
+            'Undefined'.color(:red)
+          end
+      end
+
       omniauth_providers = Gitlab.config.omniauth.providers.map { |provider| provider['name'] }
       puts ""
@@ -51,6 +71,13 @@ namespace :gitlab do
       puts "URL:\t\t#{Gitlab.config.gitlab.url}"
       puts "HTTP Clone URL:\t#{http_clone_url}"
       puts "SSH Clone URL:\t#{ssh_clone_url}"
+
+      if Gitlab.ee?
+        puts "Elasticsearch:\t#{Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing? ? "yes".color(:green) : "no"}"
+        puts "Geo:\t\t#{Gitlab::Geo.enabled? ? "yes".color(:green) : "no"}"
+        puts "Geo node:\t#{geo_node_type}" if Gitlab::Geo.enabled?
+      end
+
       puts "Using LDAP:\t#{Gitlab.config.ldap.enabled ? "yes".color(:green) : "no"}"
       puts "Using Omniauth:\t#{Gitlab::Auth.omniauth_enabled? ? "yes".color(:green) : "no"}"
       puts "Omniauth Providers: #{omniauth_providers.join(', ')}" if Gitlab::Auth.omniauth_enabled?