Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki::hhvm: debian jessie compatibility
......................................................................
mediawiki::hhvm: debian jessie compatibility
Bug: T131749
Change-Id: I927ca0416fce7f8cf108d815530f067911ad39c3
---
M modules/mediawiki/manifests/hhvm.pp
M modules/mediawiki/manifests/hhvm/housekeeping.pp
2 files changed, 22 insertions(+), 23 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/manifests/hhvm.pp
b/modules/mediawiki/manifests/hhvm.pp
index ae512a6..a719289 100644
--- a/modules/mediawiki/manifests/hhvm.pp
+++ b/modules/mediawiki/manifests/hhvm.pp
@@ -3,7 +3,7 @@
# Configures HHVM to serve MediaWiki in FastCGI mode.
#
class mediawiki::hhvm {
- requires_os('ubuntu >= trusty')
+ requires_os('ubuntu >= trusty || Debian >= jessie')
include ::hhvm::admin
include ::hhvm::monitoring
@@ -71,29 +71,32 @@
mode => '0555',
}
+ if os_version('ubuntu >= trusty') {
+ # Provision an Upstart task (a short-running process) that runs
+ # when HHVM is started and that warms up the JIT by repeatedly
+ # requesting URLs read from /etc/hhvm/warmup.urls.
- # Provision an Upstart task (a short-running process) that runs
- # when HHVM is started and that warms up the JIT by repeatedly
- # requesting URLs read from /etc/hhvm/warmup.urls.
+ $warmup_urls = [ 'http://en.wikipedia.org/wiki/Special:Random' ]
- $warmup_urls = [ 'http://en.wikipedia.org/wiki/Special:Random' ]
+ file { '/etc/hhvm/warmup.urls':
+ content => join($warmup_urls, "\n"),
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
- file { '/etc/hhvm/warmup.urls':
- content => join($warmup_urls, "\n"),
- owner => 'root',
- group => 'root',
- mode => '0444',
+ file { '/etc/init/hhvm-warmup.conf':
+ source => 'puppet:///modules/mediawiki/hhvm-warmup.conf',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ require => File['/usr/local/bin/furl', '/etc/hhvm/warmup.urls'],
+ before => Service['hhvm'],
+ }
}
- file { '/etc/init/hhvm-warmup.conf':
- source => 'puppet:///modules/mediawiki/hhvm-warmup.conf',
- owner => 'root',
- group => 'root',
- mode => '0444',
- require => File['/usr/local/bin/furl', '/etc/hhvm/warmup.urls'],
- before => Service['hhvm'],
- }
-
+ # Note: the warmup process should be revisited and is thus not implemented
on
+ # Debian/systemd at the moment.
# Use Debian's Alternatives system to mark HHVM as the default PHP
# implementation for this system. This makes /usr/bin/php a symlink
diff --git a/modules/mediawiki/manifests/hhvm/housekeeping.pp
b/modules/mediawiki/manifests/hhvm/housekeeping.pp
index cc93cf3..a515cbe 100644
--- a/modules/mediawiki/manifests/hhvm/housekeeping.pp
+++ b/modules/mediawiki/manifests/hhvm/housekeeping.pp
@@ -13,8 +13,4 @@
mode => '0555',
}
- # Temporary - remove the old script location
- file { '/usr/local/bin/hhvm_cleanup_cache':
- ensure => absent,
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/291687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I927ca0416fce7f8cf108d815530f067911ad39c3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
