jenkins-bot has submitted this change and it was merged.
Change subject: Fix vagrant.d under nfs
......................................................................
Fix vagrant.d under nfs
Change-Id: Ibb5a9d51c272e24c437e2d2d07e9175342a9542f
---
M puppet/modules/vagrant/manifests/init.pp
M puppet/modules/vagrant/manifests/settings.pp
2 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/vagrant/manifests/init.pp
b/puppet/modules/vagrant/manifests/init.pp
index 649baac..13fce2c 100644
--- a/puppet/modules/vagrant/manifests/init.pp
+++ b/puppet/modules/vagrant/manifests/init.pp
@@ -13,10 +13,9 @@
class vagrant(
$settings_dir = '/vagrant/vagrant.d',
){
-
File {
- group => 'www-data',
- owner => 'vagrant',
+ owner => $::share_owner,
+ group => $::share_group,
}
file { $settings_dir:
diff --git a/puppet/modules/vagrant/manifests/settings.pp
b/puppet/modules/vagrant/manifests/settings.pp
index f224607..05319b4 100644
--- a/puppet/modules/vagrant/manifests/settings.pp
+++ b/puppet/modules/vagrant/manifests/settings.pp
@@ -76,8 +76,8 @@
file { $settings_file:
ensure => $ensure,
content => template('vagrant/settings.yaml.erb'),
- group => 'www-data',
- owner => 'vagrant',
+ owner => $::share_owner,
+ group => $::share_group,
}
exec { "${fname} wants reload":
--
To view, visit https://gerrit.wikimedia.org/r/138606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb5a9d51c272e24c437e2d2d07e9175342a9542f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Mattflaschen <[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
