Ori.livneh has submitted this change and it was merged.
Change subject: Revert "Create global /etc/gitconfig for deployment hosts"
......................................................................
Revert "Create global /etc/gitconfig for deployment hosts"
Git::Clone resources shell out to git as root but have no SSH key for Gerrit.
This reverts commit 20b5573468e32cd1c2a25dfb003b3528f5418289.
Change-Id: Icbf0d05ee5fbfd3d28daedd7dd6b2506d040b6bd
---
M manifests/misc/deployment.pp
M manifests/site.pp
2 files changed, 0 insertions(+), 9 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index c540a23..57c9a4d 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -422,11 +422,3 @@
hosts_allow => ['10.0.0.0/16', '10.64.0.0/22',
'10.64.16.0/24', '208.80.152.0/22', '10.64.32.0/22'];
}
}
-
-class misc::deployment::gitconfig {
- exec { 'git url rewriting':
- provider => 'shell',
- command => '/usr/bin/git config --global
url."ssh://gerrit.wikimedia.org:29418/".insteadOf
"https://gerrit.wikimedia.org/r/p/";',
- unless => '/usr/bin/git config --global
url."ssh://gerrit.wikimedia.org:29418/".insteadOf | /bin/grep -q
"https://gerrit.wikimedia.org/r/p/";';
- }
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 7a1ea1b..98eff6f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2617,7 +2617,6 @@
include generic::wikidev-umask
include role::deployment::deployment_servers::production
include misc::deployment
- include misc::deployment::gitconfig
include misc::deployment::scap_scripts
include misc::deployment::l10nupdate
include mysql
--
To view, visit https://gerrit.wikimedia.org/r/117646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbf0d05ee5fbfd3d28daedd7dd6b2506d040b6bd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: NormalUser <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
