Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214326
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/mediawiki/templates/jobchron.conf.erb
M puppet/modules/mediawiki/templates/parsoid.conf.erb
M puppet/modules/restbase/templates/upstart.conf.erb
4 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/26/214326/1
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 80609de..2a9f954 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -34,6 +34,7 @@
}
Service {
+ enable => true,
ensure => running,
}
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"
--
To view, visit https://gerrit.wikimedia.org/r/214326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib61b6e33791df96b3ec01030282669905cb681f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
