From 58786a3447e318337ff3602bd0fb06a32f4840a7 Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Wed, 31 Oct 2012 15:36:47 +1100 Subject: [PATCH] Fixing upgrade issue with not notifying the service to restart after upgrade. --- jira.yaml | 2 +- manifests/config.pp | 3 +++ manifests/service.pp | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jira.yaml b/jira.yaml index ec2d9a10..9a898460 100644 --- a/jira.yaml +++ b/jira.yaml @@ -19,7 +19,7 @@ # # Atlassian jira Git Enterprise Source Control Server jira_name: jira -jira_version: 5.1.4 +jira_version: 5.1.7 jira_package_format: zip # Directory where the webapp will run from diff --git a/manifests/config.pp b/manifests/config.pp index 6d493bb1..2bfcc500 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -27,6 +27,7 @@ content => template('jira/setenv.sh.erb'), mode => '0755', require => Class['jira::install'], + notify => Class['jira::service'], } if "${jira::params::db}" == 'postgresql' { @@ -34,6 +35,7 @@ content => template('jira/dbconfig.postgres.xml.erb'), mode => '0600', require => [Class['jira::install'],Exec['mkdirp-homedir-jira']], + notify => Class['jira::service'], } } if "${jira::params::db}" == 'mysql' { @@ -41,6 +43,7 @@ content => template('jira/dbconfig.mysql.xml.erb'), mode => '0600', require => [Class['jira::install'],Exec['mkdirp-homedir-jira']], + notify => Class['jira::service'], } } } \ No newline at end of file diff --git a/manifests/service.pp b/manifests/service.pp index 76d4ead3..436a6b98 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -25,5 +25,3 @@ require => Class['jira::config'], } } - #status => "pg_lsclusters -h | awk 'BEGIN {rc=0} {if (\$4 != \"online\") rc=3} END { exit rc }'", -#/opt/java/jdk1.6.0_33/bin/jps |grep Bootstrap # but has high risk for any tomcadt