Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/109306
Change subject: Adding $service_start_on parameter so that mediawiki-vagrant can override ...................................................................... Adding $service_start_on parameter so that mediawiki-vagrant can override mediawiki-vagrant uses /vagrant directory to host wikimetrics, so wikimetrics services cannot start before this directory is mounted. Change-Id: I6bf83535946eda98325c9bc6052fa4b0a0c8d979 --- M manifests/init.pp M manifests/queue.pp M manifests/web/daemon.pp M templates/upstart.wikimetrics.conf.erb 4 files changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/wikimetrics refs/changes/06/109306/1 diff --git a/manifests/init.pp b/manifests/init.pp index 605a230..d3fc4ac 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -61,7 +61,8 @@ # Default: root # $config_file_group - Group ownership of wikimetrics .yaml config files. # Default: root -# +# $service_start_on - start on stanza for upstart jobs (queue, web daemon). +# Default: started network-services class wikimetrics( # path in which to install wikimetrics $path = '/srv/wikimetrics', @@ -107,6 +108,7 @@ $config_directory = '/etc/wikimetrics', $config_file_owner = 'root', $config_file_group = 'root', + $service_start_on = 'started network-services', ) { if !defined(Group[$group]) { diff --git a/manifests/queue.pp b/manifests/queue.pp index 45a9697..42a0b54 100644 --- a/manifests/queue.pp +++ b/manifests/queue.pp @@ -16,14 +16,20 @@ # Install and set up redis using the redis module. include ::redis - $mode = 'queue' - $config_directory = $wikimetrics::config_directory - $wikimetrics_path = $wikimetrics::path + $mode = 'queue' + $config_directory = $::wikimetrics::config_directory + $wikimetrics_path = $::wikimetrics::path + $service_start_on = $::wikimetrics::service_start_on + # install upstart init file file { '/etc/init/wikimetrics-queue.conf': content => template('wikimetrics/upstart.wikimetrics.conf.erb'), require => Class['::wikimetrics'], } + file { '/etc/init.d/wikimetrics-queue': + ensure => 'link', + target => '/lib/init/upstart-job', + } service { 'wikimetrics-queue': ensure => 'running', diff --git a/manifests/web/daemon.pp b/manifests/web/daemon.pp index f8cfcc4..2ce3274 100644 --- a/manifests/web/daemon.pp +++ b/manifests/web/daemon.pp @@ -5,19 +5,25 @@ Class['wikimetrics'] -> Class['wikimetrics::web::daemon'] $mode = 'web' - $config_directory = $wikimetrics::config_directory - $wikimetrics_path = $wikimetrics::path + $config_directory = $::wikimetrics::config_directory + $wikimetrics_path = $::wikimetrics::path + $service_start_on = $::wikimetrics::service_start_on # install upstart init file file { '/etc/init/wikimetrics-web.conf': content => template('wikimetrics/upstart.wikimetrics.conf.erb'), require => Class['::wikimetrics'], } + file { '/etc/init.d/wikimetrics-web': + ensure => 'link', + target => '/lib/init/upstart-job', + } $service_ensure = $ensure ? { 'absent' => 'stopped', default => 'running', } + service { 'wikimetrics-web': ensure => $service_ensure, provider => 'upstart', diff --git a/templates/upstart.wikimetrics.conf.erb b/templates/upstart.wikimetrics.conf.erb index ec89f1d..aceac3c 100644 --- a/templates/upstart.wikimetrics.conf.erb +++ b/templates/upstart.wikimetrics.conf.erb @@ -1,4 +1,5 @@ -start on startup +start on <%= @service_start_on %> + setuid wikimetrics setgid wikimetrics -- To view, visit https://gerrit.wikimedia.org/r/109306 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6bf83535946eda98325c9bc6052fa4b0a0c8d979 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/wikimetrics Gerrit-Branch: master Gerrit-Owner: Ottomata <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits