[tor-commits] [dip/master] Update gitlab.yml.j2

[hiro at torproject.org]

commit fe4fd3187f5fc611ab4c7c4f0d951b2d8c4b3afe
Author: hiro <hiro at torproject.org>
Date:   Mon Dec 9 17:13:39 2019 +0100

    Update gitlab.yml.j2
---
 roles/gitlab/templates/gitlab.yml.j2 | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/roles/gitlab/templates/gitlab.yml.j2 b/roles/gitlab/templates/gitlab.yml.j2
index 79f0dd0..2c3add0 100644
--- a/roles/gitlab/templates/gitlab.yml.j2
+++ b/roles/gitlab/templates/gitlab.yml.j2
@@ -152,21 +152,8 @@ production: &base
   ## Build Artifacts
   artifacts:
     enabled: true
-{% if gitlab_storage_artifacts %}
-    object_store:
-      enabled: true
-      remote_directory: {{ gitlab_storage_artifacts }}
-      direct_upload: true
-      proxy_download: true
-      connection:
-        provider: Google
-        google_project: {{ google_service_account.project_id }}
-        google_client_email: {{ google_service_account.client_email }}
-        google_json_key_location: config/storage.json
-{% else %}
     object_store:
       enabled: false
-{% endif %}
 
   ## Merge request external diff storage
   external_diffs: