jenkins-bot has submitted this change and it was merged.
Change subject: $settings_dir mode to 0755; comment tweak
......................................................................
$settings_dir mode to 0755; comment tweak
$settings_dir is situated in the shared folder, so Puppet's attempt to pound
mode 0775 are futile and generate noise on Puppet runs. This is probably a good
sign that the creation of the settings_dir should be the job of the role class.
This patch also tweaks a comment in Vagrantfile regarding Vagrantfile-extra.rb.
Change-Id: I5c3dac1eafa26f9d720b78ce07b90ed9730ee638
---
M Vagrantfile
M puppet/modules/mediawiki/manifests/init.pp
2 files changed, 9 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Vagrantfile b/Vagrantfile
index dabb889..114ae3f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -100,7 +100,7 @@
end
begin
+ # Load custom Vagrantfile overrides from 'Vagrantfile-extra.rb'
require_relative 'Vagrantfile-extra'
rescue LoadError
- # No local Vagrantfile overrides.
end
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index 3b35e28..b190972 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -73,7 +73,14 @@
unless => "php ${dir}/maintenance/sql.php </dev/null",
}
- file { [ $upload_dir, $settings_dir ]:
+ file { $settings_dir:
+ ensure => directory,
+ owner => 'vagrant',
+ group => 'www-data',
+ mode => '0755',
+ }
+
+ file { $upload_dir:
ensure => directory,
owner => 'vagrant',
group => 'www-data',
--
To view, visit https://gerrit.wikimedia.org/r/72680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c3dac1eafa26f9d720b78ce07b90ed9730ee638
Gerrit-PatchSet: 1
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
