[tor-commits] [dip/master] Change gitaly configuration and update hosts

hiro at torproject.org hiro at torproject.org
Tue Dec 10 10:40:51 UTC 2019


commit 496946fcc98a2f3cd46562012a3f1acdcd797763
Author: hiro <hiro at torproject.org>
Date:   Tue Dec 10 11:40:33 2019 +0100

    Change gitaly configuration and update hosts
---
 inventories/prod/hosts                | 4 ++--
 inventories/test/hosts                | 4 ++--
 roles/gitaly/templates/gitaly.toml.j2 | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/inventories/prod/hosts b/inventories/prod/hosts
index 439099f..85da552 100644
--- a/inventories/prod/hosts
+++ b/inventories/prod/hosts
@@ -2,7 +2,7 @@
 gitlab-01.torproject.org ansible_connection=local
 
 [salsa-webhook]
-webhook.dip.torproject.org ansible_connection=local
+webhook.dip.torproject.org ansible_connection=local ansible_become=True ansible_host=gitlab-01.torproject.org ansible_become_user=salsa-webhook
 
 [docker-registry]
-registry.dip.torproject.org ansible_connection=local
+registry.dip.torproject.org ansible_connection=local ansible_become=True ansible_host=gitlab-01.torproject.org ansible_become_user=salsa-registry
diff --git a/inventories/test/hosts b/inventories/test/hosts
index 439099f..85da552 100644
--- a/inventories/test/hosts
+++ b/inventories/test/hosts
@@ -2,7 +2,7 @@
 gitlab-01.torproject.org ansible_connection=local
 
 [salsa-webhook]
-webhook.dip.torproject.org ansible_connection=local
+webhook.dip.torproject.org ansible_connection=local ansible_become=True ansible_host=gitlab-01.torproject.org ansible_become_user=salsa-webhook
 
 [docker-registry]
-registry.dip.torproject.org ansible_connection=local
+registry.dip.torproject.org ansible_connection=local ansible_become=True ansible_host=gitlab-01.torproject.org ansible_become_user=salsa-registry
diff --git a/roles/gitaly/templates/gitaly.toml.j2 b/roles/gitaly/templates/gitaly.toml.j2
index 22a2e60..fe52ded 100644
--- a/roles/gitaly/templates/gitaly.toml.j2
+++ b/roles/gitaly/templates/gitaly.toml.j2
@@ -59,6 +59,6 @@ num_workers = 4
 dir = "{{ ansible_user_dir }}/gitlab-shell"
 
 # # You can adjust the concurrency of each RPC endpoint
-# [[concurrency]]
-# rpc = "/gitaly.RepositoryService/GarbageCollect"
-# max_per_repo = 1
+[[concurrency]]
+rpc = "/gitaly.RepositoryService/GarbageCollect"
+max_per_repo = 2



More information about the tor-commits mailing list