Andrew Bogott has submitted this change and it was merged.
Change subject: labs-vagrant: Fix initial clone and ownership
......................................................................
labs-vagrant: Fix initial clone and ownership
Followup to I3eea91a5933af31457a3ac24624e0fda82d61849. Fix an ordering
issue in git::clone where the File resources for the target directory
was applied in the wrong order for creating clones in root owned
directories. Also change the applied permissions to have the
MediaWiki-Vagrant clone owned by vagrant:wikidev instead of
vagrant:www-data. Add a File resource to change the permissions on
the log output directory to allow www-data to write there.
Change-Id: I194d788d1254c1e05ea53937b4663faaed537b62
---
M modules/git/manifests/clone.pp
M modules/labs_vagrant/manifests/init.pp
2 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp
index 0d0f308..3853af5 100644
--- a/modules/git/manifests/clone.pp
+++ b/modules/git/manifests/clone.pp
@@ -135,7 +135,7 @@
mode => $file_mode,
owner => $owner,
group => $group,
- require => Exec["git_clone_${title}"],
+ before => Exec["git_clone_${title}"],
}
}
diff --git a/modules/labs_vagrant/manifests/init.pp
b/modules/labs_vagrant/manifests/init.pp
index 42f7fe7..d23e956 100644
--- a/modules/labs_vagrant/manifests/init.pp
+++ b/modules/labs_vagrant/manifests/init.pp
@@ -43,10 +43,18 @@
directory => $install_directory,
origin => 'https://gerrit.wikimedia.org/r/mediawiki/vagrant',
owner => 'vagrant',
- group => 'www-data',
+ group => 'wikidev',
shared => true,
}
+ file { "${install_directory}/logs":
+ ensure => 'directory',
+ owner => 'vagrant',
+ group => 'www-data',
+ mode => '0775',
+ require => Git::Clone['vagrant'],
+ }
+
file { '/vagrant':
ensure => 'link',
target => $install_directory,
--
To view, visit https://gerrit.wikimedia.org/r/161353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I194d788d1254c1e05ea53937b4663faaed537b62
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
