From 5b160c7f0614b6152b219ca0cfd6b74a5423e247 Mon Sep 17 00:00:00 2001 From: Robert Helmer Date: Tue, 4 Jun 2013 17:45:09 -0700 Subject: [PATCH 1/2] bug 871056 - subscribe not needed --- puppet/manifests/classes/socorro-base.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/puppet/manifests/classes/socorro-base.pp b/puppet/manifests/classes/socorro-base.pp index 8e4cd8d18f..bdc193d834 100644 --- a/puppet/manifests/classes/socorro-base.pp +++ b/puppet/manifests/classes/socorro-base.pp @@ -261,7 +261,6 @@ apache2: enable => true, ensure => running, - subscribe => Exec['socorro-install'], require => [Package[apache2], Exec[enable-mod-rewrite], Exec[enable-mod-headers], Exec[enable-mod-ssl], Exec[enable-mod-php5], From 98d982125e7acf325896270d1c3ded4ad627204f Mon Sep 17 00:00:00 2001 From: Robert Helmer Date: Tue, 4 Jun 2013 17:54:50 -0700 Subject: [PATCH 2/2] bug 871056 - reinstall dep on apache2 not needed, service notify is enough --- puppet/manifests/classes/socorro-base.pp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/puppet/manifests/classes/socorro-base.pp b/puppet/manifests/classes/socorro-base.pp index bdc193d834..74f49d6ab2 100644 --- a/puppet/manifests/classes/socorro-base.pp +++ b/puppet/manifests/classes/socorro-base.pp @@ -236,9 +236,7 @@ alias => 'socorro-reinstall', cwd => '/home/socorro/dev/socorro', timeout => '3600', - require => [Exec['socorro-install'], - Service['apache2'], - Service['memcached']], + require => [Exec['socorro-install']], logoutput => on_failure, notify => [Service['apache2'], Service['memcached']], user => 'socorro'; @@ -263,8 +261,8 @@ ensure => running, require => [Package[apache2], Exec[enable-mod-rewrite], Exec[enable-mod-headers], Exec[enable-mod-ssl], - Exec[enable-mod-php5], - Package[libapache2-mod-php5], Exec[enable-mod-proxy]]; + Exec[enable-mod-php5], Package[libapache2-mod-php5], + Exec[enable-mod-proxy]]; } file {