jenkins-bot has submitted this change and it was merged.
Change subject: Start services after mounting /vagrant
......................................................................
Start services after mounting /vagrant
The mediawiki services are set to start on boot. However, as they reside
in the /vagrant directory mounted by Vagrant after the boot, Upstart
fails to start them. This patch modifies the services' Upstart init
scripts to wait for the mediawiki-ready signal.
Bug: T96231
Change-Id: Ib61b6e33791df96b3ec01030282669905cb681f4
---
M puppet/manifests/site.pp
M puppet/modules/hhvm/files/hhvm.conf
M puppet/modules/mediawiki/templates/jobchron.conf.erb
M puppet/modules/mediawiki/templates/parsoid.conf.erb
M puppet/modules/restbase/templates/upstart.conf.erb
M puppet/modules/scholarships/files/debug_smtp.conf
M puppet/modules/sentry/templates/upstart.erb
M puppet/modules/smtplog/templates/smtplog.conf.erb
8 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 80609de..fe6ae67 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -35,6 +35,7 @@
Service {
ensure => running,
+ enable => true,
}
Package {
diff --git a/puppet/modules/hhvm/files/hhvm.conf
b/puppet/modules/hhvm/files/hhvm.conf
index fcb6b80..4a58f0e 100644
--- a/puppet/modules/hhvm/files/hhvm.conf
+++ b/puppet/modules/hhvm/files/hhvm.conf
@@ -3,7 +3,7 @@
# Configured via /etc/default/hhvm.
description "HipHop Virtual Machine for PHP"
-start on (local-filesystems and net-device-up IFACE!=lo)
+start on mediawiki-ready
pre-start script
[ ! -r /etc/default/hhvm ] && { stop; exit 0; }
diff --git a/puppet/modules/mediawiki/templates/jobchron.conf.erb
b/puppet/modules/mediawiki/templates/jobchron.conf.erb
index 5727a45..0781e4c 100644
--- a/puppet/modules/mediawiki/templates/jobchron.conf.erb
+++ b/puppet/modules/mediawiki/templates/jobchron.conf.erb
@@ -1,7 +1,7 @@
# jobchron -- Continuously maintain MediaWiki job queue
description "MediaWiki job queue chron loop"
-start on (runlevel [2345] and net-device-up IFACE!=lo)
+start on mediawiki-ready
stop on runlevel [!2345]
pre-start script
diff --git a/puppet/modules/mediawiki/templates/parsoid.conf.erb
b/puppet/modules/mediawiki/templates/parsoid.conf.erb
index 419c086..56fb405 100644
--- a/puppet/modules/mediawiki/templates/parsoid.conf.erb
+++ b/puppet/modules/mediawiki/templates/parsoid.conf.erb
@@ -5,7 +5,7 @@
description "Parsoid HTTP service"
-start on (local-filesystems and net-device-up IFACE!=lo)
+start on mediawiki-ready
stop on runlevel [!2345]
setuid "www-data"
diff --git a/puppet/modules/restbase/templates/upstart.conf.erb
b/puppet/modules/restbase/templates/upstart.conf.erb
index 0e6c365..2fb01d0 100644
--- a/puppet/modules/restbase/templates/upstart.conf.erb
+++ b/puppet/modules/restbase/templates/upstart.conf.erb
@@ -5,7 +5,7 @@
description "RESTBase REST API service"
-start on (local-filesystems and net-device-up IFACE!=lo)
+start on mediawiki-ready
stop on runlevel [!2345]
setuid "www-data"
diff --git a/puppet/modules/scholarships/files/debug_smtp.conf
b/puppet/modules/scholarships/files/debug_smtp.conf
index e6f1f5e..613d048 100644
--- a/puppet/modules/scholarships/files/debug_smtp.conf
+++ b/puppet/modules/scholarships/files/debug_smtp.conf
@@ -1,7 +1,7 @@
# This file is managed by puppet
description "Debugging smtp server that logs to /vagrant/logs"
-start on (local-filesystems and net-device-up IFACE=lo)
+start on mediawiki-ready
stop on shutdown
script
diff --git a/puppet/modules/sentry/templates/upstart.erb
b/puppet/modules/sentry/templates/upstart.erb
index afab1c1..2ecb426 100644
--- a/puppet/modules/sentry/templates/upstart.erb
+++ b/puppet/modules/sentry/templates/upstart.erb
@@ -4,7 +4,7 @@
description "Sentry error log tracker"
-start on startup
+start on mediawiki-ready
exec /sbin/start-stop-daemon --quiet --start \
--chuid 'www-data:www-data' \
diff --git a/puppet/modules/smtplog/templates/smtplog.conf.erb
b/puppet/modules/smtplog/templates/smtplog.conf.erb
index 6ad5461..708e8ff 100644
--- a/puppet/modules/smtplog/templates/smtplog.conf.erb
+++ b/puppet/modules/smtplog/templates/smtplog.conf.erb
@@ -1,7 +1,7 @@
# This file is managed by puppet
description "Debugging smtp server that logs to <%= @log_file %>"
-start on (local-filesystems and net-device-up IFACE=lo)
+start on mediawiki-ready
stop on shutdown
script
--
To view, visit https://gerrit.wikimedia.org/r/214326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib61b6e33791df96b3ec01030282669905cb681f4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Mattflaschen <[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
