Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml

3 files changed, 42 insertions, 6 deletions

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 1f61a4f67bb..b6bbc2a0af6 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -470,10 +470,8 @@ with setting up Gitaly until you upgrade to GitLab 9.2 or later.
     sudo chmod 0700 /home/git/gitlab/tmp/sockets/private
     sudo chown git /home/git/gitlab/tmp/sockets/private
 
-    # Configure Gitaly
-    cd /home/git/gitaly
-    sudo -u git cp config.toml.example config.toml
     # If you are using non-default settings you need to update config.toml
+    cd /home/git/gitaly
     sudo -u git -H editor config.toml
 
     # Enable Gitaly in the init script
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index 9f6cfe3957c..a4a9b20297c 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -2,6 +2,8 @@ namespace :gitlab do
   namespace :gitaly do
     desc "GitLab | Install or upgrade gitaly"
     task :install, [:dir] => :environment do |t, args|
+      require 'toml'
+
       warn_user_is_not_gitlab
       unless args.dir.present?
         abort %(Please specify the directory where you want to install gitaly:\n  rake "gitlab:gitaly:install[/home/git/gitaly]")
@@ -16,6 +18,7 @@ namespace :gitlab do
       command = status.zero? ? 'gmake' : 'make'
 
       Dir.chdir(args.dir) do
+        create_gitaly_configuration
         run_command!([command])
       end
     end
@@ -33,5 +36,39 @@ namespace :gitlab do
 
       puts TOML.dump(storage: config)
     end
+
+    private
+
+    # We cannot create config.toml files for all possible Gitaly configuations.
+    # For instance, if Gitaly is running on another machine then it makes no
+    # sense to write a config.toml file on the current machine. This method will
+    # only write a config.toml file in the most common and simplest case: the
+    # case where we have exactly one Gitaly process and we are sure it is
+    # running locally because it uses a Unix socket.
+    def create_gitaly_configuration
+      storages = []
+      address = nil
+
+      Gitlab.config.repositories.storages.each do |key, val|
+        if address
+          if address != val['gitaly_address']
+            raise ArgumentError, "Your gitlab.yml contains more than one gitaly_address."
+          end
+        elsif URI(val['gitaly_address']).scheme != 'unix'
+          raise ArgumentError, "Automatic config.toml generation only supports 'unix:' addresses."
+        else
+          address = val['gitaly_address']
+        end
+
+        storages << { name: key, path: val['path'] }
+      end
+
+      File.open("config.toml", "w") do |f|
+        f.puts TOML.dump(socket_path: address.sub(%r{\Aunix:}, ''), storages: storages)
+      end
+    rescue ArgumentError => e
+      puts "Skipping config.toml generation:"
+      puts e.message
+    end
   end
 end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 60c2096a126..b974335a081 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -124,12 +124,13 @@ module TestEnv
       raise "Can't clone gitaly"
     end
 
-    start_gitaly(gitaly_dir, socket_path)
+    start_gitaly(gitaly_dir)
   end
 
-  def start_gitaly(gitaly_dir, socket_path)
+  def start_gitaly(gitaly_dir)
     gitaly_exec = File.join(gitaly_dir, 'gitaly')
-    @gitaly_pid = spawn({ "GITALY_SOCKET_PATH" => socket_path }, gitaly_exec, [:out, :err] => '/dev/null')
+    gitaly_config = File.join(gitaly_dir, 'config.toml')
+    @gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => '/dev/null')
   end
 
   def stop_gitaly