jenkins-bot has submitted this change and it was merged.
Change subject: Removed unnecessary file resource conditional
......................................................................
Removed unnecessary file resource conditional
Fixed directory permissions, allowing www-data group writes.
Follows-up I45def381a30c5c0719ab38ca627c7c91df91c5e3.
Change-Id: I8986b3d3f3381ec4aea0e5df08f826b33776afb8
Bug: 70959
---
M puppet/modules/mediawiki/manifests/wiki.pp
1 file changed, 2 insertions(+), 12 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/manifests/wiki.pp
b/puppet/modules/mediawiki/manifests/wiki.pp
index b42bda5..e886a8e 100644
--- a/puppet/modules/mediawiki/manifests/wiki.pp
+++ b/puppet/modules/mediawiki/manifests/wiki.pp
@@ -67,21 +67,11 @@
confpath => $settings_root,
}
- # by default, wiki's share the same upload directory
- if !defined(File[$upload_dir]) {
- file { $upload_dir:
- ensure => directory,
- owner => 'vagrant',
- group => 'www-data',
- mode => '0755',
- }
- }
-
- file { $cache_dir:
+ file { [$upload_dir, $cache_dir]:
ensure => directory,
owner => 'vagrant',
group => 'www-data',
- mode => '0755',
+ mode => '0775',
}
Exec {
--
To view, visit https://gerrit.wikimedia.org/r/162155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8986b3d3f3381ec4aea0e5df08f826b33776afb8
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
Gerrit-Reviewer: BryanDavis <[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
