20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250370
Change subject: iridium system-wide gitconfig needs http.proxy
......................................................................
iridium system-wide gitconfig needs http.proxy
Phabricator needs to mirror some repos from github. Apparently
accessing the internet requires a proxy, so it needs to be specified
in the system-wide git configuration.
Change-Id: I9f7b950d8a0d697d72653630c7f23c8fc99f1832
---
D modules/phabricator/files/system.gitconfig
M modules/phabricator/manifests/vcs.pp
A modules/phabricator/templates/system.gitconfig.erb
3 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/250370/1
diff --git a/modules/phabricator/files/system.gitconfig
b/modules/phabricator/files/system.gitconfig
deleted file mode 100644
index a1bd79f..0000000
--- a/modules/phabricator/files/system.gitconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[remote "origin"]
- fetch = +refs/changes/*:refs/changes/*
- fetch = +refs/meta/*:refs/meta/*
diff --git a/modules/phabricator/manifests/vcs.pp
b/modules/phabricator/manifests/vcs.pp
index f0bb4fd..986c6df 100644
--- a/modules/phabricator/manifests/vcs.pp
+++ b/modules/phabricator/manifests/vcs.pp
@@ -45,10 +45,14 @@
require => Package['git'],
}
+ $http_proxy = "http://webproxy.${::site}.wmnet:8080";
+
# Configure all git repositories we host
file { '/etc/gitconfig':
- source => 'puppet:///modules/phabricator/system.gitconfig',
+ content => template('phabricator/system.gitconfig.erb'),
require => Package['git'],
+ owner => 'root',
+ group => 'root',
}
file { $ssh_hook_path:
diff --git a/modules/phabricator/templates/system.gitconfig.erb
b/modules/phabricator/templates/system.gitconfig.erb
new file mode 100644
index 0000000..1bc66b9
--- /dev/null
+++ b/modules/phabricator/templates/system.gitconfig.erb
@@ -0,0 +1,9 @@
+[remote "origin"]
+ fetch = +refs/changes/*:refs/changes/*
+ fetch = +refs/meta/*:refs/meta/*
+
+[http]
+ proxy = <%= @http_proxy %>
+
+[https]
+ proxy = <%= @http_proxy %>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/250370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f7b950d8a0d697d72653630c7f23c8fc99f1832
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
