jenkins-bot has submitted this change and it was merged.
Change subject: Force creation of /etc/hhvm/php.ini
......................................................................
Force creation of /etc/hhvm/php.ini
The current HHVM Debian package, v3.3.1+dfsg1-1+wm3, used in
MediaWiki-Vagrant seems to incorrectly create the php.ini file in
/etc/hhvm/php.ini/php.ini instead of in /etc/hhvm/php.ini. Thus,
when vagrant provision runs, its attempt to create/overwrite the file
/etc/hhvm/php.ini fails because it’s a directory. setting force => true
in the puppet congifuration allows it to do so.
Bug: T87478
Change-Id: I7b955a3b86242a44b9c4e42adfe0b423b55d5ea6
---
M puppet/modules/hhvm/manifests/init.pp
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index 3300e12..4318d0d 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -69,6 +69,14 @@
file { '/etc/hhvm/php.ini':
content => php_ini($common_settings),
+
+ # @todo
+ # remove force => true once the dpkg for hhvm is updated to create
+ # its version of php.ini in /etc/hhvm/php.ini instead of in
+ # /etc/hhvm/php.ini/php.ini
+ #
+ # @see https://phabricator.wikimedia.org/T87478
+ force => true
}
file { '/etc/hhvm/fcgi.ini':
--
To view, visit https://gerrit.wikimedia.org/r/186917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b955a3b86242a44b9c4e42adfe0b423b55d5ea6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dan-nl <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dan-nl <[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
