[tor-commits] [dip/master] Modify submodules

[hiro at torproject.org]

commit 416484527fad1a3e651eba265e3a66ab586a82ee
Author: hiro <hiro at torproject.org>
Date:   Tue Oct 1 17:53:21 2019 +0200

    Modify submodules
---
 .gitmodules                         |  5 +----
 inventories/prod/group_vars/all.yml | 16 +++++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 30e2d41..9788653 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "inventories/prod/secrets"]
 	path = inventories/prod/secrets
-	url = git at salsa.debian.org:salsa/salsa-ansible-secrets-prod.git
-[submodule "inventories/test/secrets"]
-	path = inventories/test/secrets
-	url = git at salsa.debian.org:salsa/salsa-ansible-secrets-test.git
+	url = https://git.torproject.org/admin/services/gitlab/dip-configs.git
diff --git a/inventories/prod/group_vars/all.yml b/inventories/prod/group_vars/all.yml
index 91d48b7..8fa8e97 100644
--- a/inventories/prod/group_vars/all.yml
+++ b/inventories/prod/group_vars/all.yml
@@ -1,8 +1,10 @@
 ---
-external_domain: salsa.debian.org
-external_domain_logs: salsa-logs.debian.net
-external_domain_pages: pages.debian.net
-external_domain_registry: registry.salsa.debian.org
-ldapsync_filter: (supplementaryGid=Debian)
-gitlab_storage_artifacts: debian-salsa-prod-gitlab-artifacts
-gitlab_storage_lfs: debian-salsa-prod-gitlab-lfs
+external_domain: dip.torproject.org
+external_domain_pages: pages.dip.torproject.org
+external_domain_registry: registry.dip.torproject.org
+external_domain_logs: logs.dip.torproject.org
+ldapsync_filter: (supplementaryGid=TorProject)
+gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts
+gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
+ldap_org: torproject
+ldap_host: db.torproject.orgs