From 663e36dfc4f73fcd9c1010b7b09fbb5b047ea95b Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Mon, 26 Aug 2013 16:52:45 +0300 Subject: [PATCH] solr: Dependency fixes for service startup --- solr/files/solr.init | 2 +- solr/manifests/init.pp | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/solr/files/solr.init b/solr/files/solr.init index 26ac10a..b790bf8 100644 --- a/solr/files/solr.init +++ b/solr/files/solr.init @@ -39,7 +39,7 @@ fi start_solr() { # Check to see if Solr is running - pgrep -u $SOLRUSER -f start.jar >/dev/null + pgrep -u ${SOLRUSER} -f start.jar >/dev/null RUNNING=$? if [ $RUNNING -eq 0 ]; then echo "[FAILED]" diff --git a/solr/manifests/init.pp b/solr/manifests/init.pp index 5dba6da..f3eb412 100644 --- a/solr/manifests/init.pp +++ b/solr/manifests/init.pp @@ -84,31 +84,37 @@ class solr { ensure => link, target => "/usr/local/share/solr/example/start.jar", require => File["/srv/solr/run"], + before => Service["solr"], } file { "/srv/solr/run/contexts": ensure => link, target => "/usr/local/share/solr/example/contexts", require => File["/srv/solr/run"], + before => Service["solr"], } file { "/srv/solr/run/etc": ensure => link, target => "/usr/local/share/solr/example/etc", require => File["/srv/solr/run"], + before => Service["solr"], } file { "/srv/solr/run/lib": ensure => link, target => "/usr/local/share/solr/example/lib", require => File["/srv/solr/run"], + before => Service["solr"], } file { "/srv/solr/run/resources": ensure => link, target => "/usr/local/share/solr/example/resources", require => File["/srv/solr/run"], + before => Service["solr"], } file { "/srv/solr/run/webapps": ensure => link, target => "/usr/local/share/solr/example/webapps", require => File["/srv/solr/run"], + before => Service["solr"], } file { "/etc/init.d/solr": @@ -131,8 +137,9 @@ class solr { } service { "solr": - ensure => running, - enable => true, + ensure => running, + enable => true, + hasstatus => true, } file { "/etc/solr":