poolparty.rb in auser-poolparty-0.2.46

- old
+ new

@@ -45,11 +45,11 @@
           
         end
         
         # Cloud panel setup
         
-        has_directory(:name => "/var/www/cloudpanel")
+        # has_directory(:name => "/var/www/cloudpanel")
         
         # has_file(:name => "/etc/yaws/conf.d/localhost.conf") do
         #   template File.join(File.dirname(__FILE__), "..", "templates/yaws.conf")
         # end
         
@@ -61,23 +61,24 @@
             command(PoolParty::Remote::RemoteInstance.puppet_master_rerun_command)
           end
           has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
             requires get_gempackage("poolparty-latest")
             command(". /etc/profile && cloud-handle-load")
-          end          
+          end
         end
         execute_on_node do
           has_cron(:name => "puppetd runner", :user => Base.user, :minute => "*/5") do
             requires get_gempackage("poolparty-latest")
             command(PoolParty::Remote::RemoteInstance.puppet_rerun_commad)
           end
         end
         
         # These are all requirements on the master
         execute_on_master do
-          has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3", :requires => get_gempackage("poolparty-latest")})
           # TODO: Update this so it only runs when needed
           has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master", :requires => [get_gempackage("poolparty-latest"), get_exec("build_messenger")], :onlyif => "ps aux | grep beam | grep master")
+          
+          has_cron({:name => "maintain script", :command => ". /etc/profile && which cloud-maintain | /bin/sh", :minute => "*/3", :requires => [get_gempackage("poolparty-latest"), get_cron("puppetd runner"), get_cron("Load handler"), get_exec("start master messenger"), get_service("haproxy")]})
           
           has_remotefile(:name => "/usr/bin/puppetcleaner") do
             mode 744
             template File.join(File.dirname(__FILE__), "..", "templates/puppetcleaner")
           end
\ No newline at end of file