jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/354121 )
Change subject: More service file improvements ...................................................................... More service file improvements hhvm was failing, easiest way to fix it is to use RuntimeDirectory. Made hhvm-development use a different directory. Change-Id: I265d4dcac45729dd3d1246216c9284345c27f8b0 --- M puppet/modules/hhvm/files/development.ini M puppet/modules/hhvm/files/hhvm-development.service M puppet/modules/hhvm/files/hhvm.service M puppet/modules/nginx/files/nginx.conf M puppet/modules/wiki/files/mw-jobrunner.service 5 files changed, 9 insertions(+), 11 deletions(-) Approvals: jenkins-bot: Verified Siebrand: Looks good to me, approved diff --git a/puppet/modules/hhvm/files/development.ini b/puppet/modules/hhvm/files/development.ini index aa27491..35016fc 100644 --- a/puppet/modules/hhvm/files/development.ini +++ b/puppet/modules/hhvm/files/development.ini @@ -1,6 +1,6 @@ ; php options -pid = /run/hhvm/hhvm-development.pid +pid = /run/hhvm-development/hhvm.pid display_errors = 1 memory_limit = 200M @@ -10,13 +10,13 @@ ; hhvm specific hhvm.server.ip = 127.0.0.1 -hhvm.server.file_socket = /run/hhvm/development.sock +hhvm.server.file_socket = /run/hhvm-development/hhvm.sock hhvm.server.type = fastcgi hhvm.server.gzip_compression_level = 0 hhvm.server.graceful_shutdown_wait = 5 hhvm.admin_server.port = 9002 -hhvm.repo.central.path = /run/hhvm/development.hhbc +hhvm.repo.central.path = /run/hhvm-development/hhvm.hhbc ; Temporarily for https://github.com/facebook/hhvm/issues/7674 hhvm.repo.central.file_user=www-data hhvm.repo.central.file_group=www-data diff --git a/puppet/modules/hhvm/files/hhvm-development.service b/puppet/modules/hhvm/files/hhvm-development.service index a2303ed..5949255 100644 --- a/puppet/modules/hhvm/files/hhvm-development.service +++ b/puppet/modules/hhvm/files/hhvm-development.service @@ -4,11 +4,10 @@ [Service] User=www-data Group=www-data -ExecStartPre=/bin/mkdir -p /run/hhvm -ExecStartPre=/bin/chown -R www-data:www-data /run/hhvm +RuntimeDirectory=hhvm-development ExecStart=/usr/bin/hhvm -m daemon -c /etc/hhvm/php.ini -c /etc/hhvm/development.ini -ExecStop=/bin/rm -f /run/hhvm/hhvm-development.sock -PIDFile=/run/hhvm/hhvm-development.pid +ExecStop=/bin/rm -f /run/hhvm-development/hhvm.sock +PIDFile=/run/hhvm-development/hhvm.pid PrivateDevices=true ProtectHome=read-only ProtectSystem=full diff --git a/puppet/modules/hhvm/files/hhvm.service b/puppet/modules/hhvm/files/hhvm.service index 6eaf8b6..5379db9 100644 --- a/puppet/modules/hhvm/files/hhvm.service +++ b/puppet/modules/hhvm/files/hhvm.service @@ -4,8 +4,7 @@ [Service] User=www-data Group=www-data -ExecStartPre=/bin/mkdir -p /run/hhvm -ExecStartPre=/bin/chown -R www-data:www-data /run/hhvm +RuntimeDirectory=hhvm ExecStart=/usr/bin/hhvm -m daemon -c /etc/hhvm/php.ini -c /etc/hhvm/server.ini ExecStop=/bin/rm -f /run/hhvm/hhvm.sock PIDFile=/run/hhvm/hhvm.pid diff --git a/puppet/modules/nginx/files/nginx.conf b/puppet/modules/nginx/files/nginx.conf index fa8e990..e353ac6 100644 --- a/puppet/modules/nginx/files/nginx.conf +++ b/puppet/modules/nginx/files/nginx.conf @@ -54,7 +54,7 @@ } upstream hhvm-dev { - server unix:/run/hhvm/development.sock; + server unix:/run/hhvm-development/hhvm.sock; } include /etc/nginx/sites/*; diff --git a/puppet/modules/wiki/files/mw-jobrunner.service b/puppet/modules/wiki/files/mw-jobrunner.service index 58680b1..761b972 100644 --- a/puppet/modules/wiki/files/mw-jobrunner.service +++ b/puppet/modules/wiki/files/mw-jobrunner.service @@ -1,6 +1,6 @@ [Unit] Description=Processes MediaWiki jobs for production site -Requires=mysql.service +After=mysql.service hhvm.service network.target [Service] User=www-data -- To view, visit https://gerrit.wikimedia.org/r/354121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I265d4dcac45729dd3d1246216c9284345c27f8b0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
