jenkins-bot has submitted this change and it was merged.
Change subject: Exec 'git clone' as 'vagrant' user
......................................................................
Exec 'git clone' as 'vagrant' user
This change chowns '/srv' to vagrant:www-data (like /vagrant) and makes 'git
clone' run as 'vagrant' by default.
Bug: 49830
Change-Id: I704b15829d6dc13a9573d14221ce43267d539fdc
---
M puppet/manifests/base.pp
M puppet/modules/git/manifests/clone.pp
2 files changed, 11 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/base.pp b/puppet/manifests/base.pp
index c169d11..29511c7 100644
--- a/puppet/manifests/base.pp
+++ b/puppet/manifests/base.pp
@@ -40,6 +40,12 @@
mode => '0644',
}
+file { '/srv':
+ owner => 'vagrant',
+ group => 'www-data',
+ mode => '0755',
+}
+
package { 'python-pip':
ensure => present,
}
diff --git a/puppet/modules/git/manifests/clone.pp
b/puppet/modules/git/manifests/clone.pp
index ca2adc1..da9b2a2 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -12,6 +12,9 @@
# Remote URL for the repository. If unspecified, the resource title
# will be interpolated into $git::urlformat.
#
+# [*user*]
+# Execute git-clone as this user. Defaults to 'vagrant'.
+#
# === Examples
#
# Clone VisualEditor to MediaWiki extension path:
@@ -20,7 +23,7 @@
# directory => '/vagrant/mediawiki/extensions/VisualEditor',
# }
#
-define git::clone($directory, $remote=undef) {
+define git::clone($directory, $remote=undef, $user='vagrant') {
include git
$url = $remote ? {
@@ -32,7 +35,7 @@
command => "git clone ${url} ${directory}",
creates => "${directory}/.git/refs/remotes",
require => Package['git'],
- logoutput => true,
+ user => $user,
timeout => 0,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/69502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I704b15829d6dc13a9573d14221ce43267d539fdc
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[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
