Merge pull request #1273 from rhelmer/bug871056-apache2-intermittent-…

…failure Bug871056 apache2 intermittent failure
mozilla-services · Jun 5, 2013 · 047fd24 · 047fd24
2 parents 928c8e8 + 98d9821
commit 047fd24
Showing 1 changed file with 3 additions and 6 deletions.
diff --git 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';
@@ -261,11 +259,10 @@
         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],
-                        Package[libapache2-mod-php5], Exec[enable-mod-proxy]];
+                        Exec[enable-mod-php5], Package[libapache2-mod-php5],
+                        Exec[enable-mod-proxy]];
     }
 
      file {