poolparty 0.2.84 → 1.2.2

data/config/jeweler.rb

@@ -0,0 +1,52 @@
+# You also need to setup your name and email for git if you haven't already done so.
+# Info at http://github.com/guides/tell-git-your-user-name-and-email-address
+
+begin
+class Array
+  def one_of_regex
+    option_list = join "|"
+    Regexp.new "(#{option_list})"
+  end
+end
+
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "poolparty"
+    s.description = "PoolParty: The easy, open-source, cross-cloud management solution"
+    s.summary = <<-EOM      
+      Self-healing, auto-scaling system administration, provisioning
+      and maintaining tool that makes cloud computing fun and easy
+    EOM
+    
+    s.homepage = "http://poolpartyrb.com"
+    s.email = "ari.lerner@citrusbyte.com"
+    s.authors = ["Ari Lerner"]
+    
+    s.test_files = Dir["test/**/test_*.rb"]
+    excludes_regexp = ["lib/erlang"].one_of_regex
+
+    s.files = (%w(Rakefile History.txt README.txt PostInstall.txt License.txt VERSION.yml) + 
+              Dir["{config,examples,lib,spec,test,tasks,script,generators,bin,vendor}/**/*"]).delete_if{|f| f =~ excludes_regexp}
+    
+    s.has_rdoc = true
+    s.extra_rdoc_files = ["README.txt", "License.txt", 'History.txt']
+    s.rdoc_options = ['--quiet', '--title', 'PoolParty documentation',
+        # "index.html",
+        "--line-numbers",
+        "--main", "README"
+        ]
+    
+    s.add_dependency 'activesupport'
+    s.add_dependency 'logging'
+    # s.add_dependency 'auser-dslify'
+    # s.add_dependency 'auser-parenting'
+    # s.add_dependency 'auser-suitcase'
+    # s.add_dependency 'ruby2ruby'  #TODO: remove this after verifying removing doesnt break anything
+    s.add_dependency 'grempe-amazon-ec2'
+    s.add_dependency 'rubigen', ">=1.5.2"
+    # Certainly there should be more here
+    
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end

data/config/requirements.rb

@@ -2,14 +2,6 @@ require 'fileutils'
 include FileUtils
 
 require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
+require 'rake'
 
 $:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))

data/examples/basic.rb

@@ -1,20 +1,20 @@
 # Basic pool spec
 # Shows global settings for the clouds
-
 pool :application do
-  
-  instances 3..5
-  keypair "auser"
-  
-  cloud :app do
-    minimum_instances 2
+  instances 3..50
+    
+  cloud :basic_app do
+    
+    minimum_instances 12
     ami "ami-abc123"
+    junk_yard_dogs "pains"
+    has_file :name => "/etc/init.d/motd", :content => "Welcome to your PoolParty instance"
   end
   
-  cloud :db do
-    keypair "hotstuff_database"
-    maximum_instances 20
+  cloud :basic_db do    
+    minimum_instances 19
     ami "ami-1234bc"
+    junk_yard_dogs "are bad"
   end
 
 end

data/examples/deploy.rb

@@ -0,0 +1,5 @@
+set :keep_releases,       5
+
+task :development do
+  role :littleye_web, cloud(:littleye_web).ip
+end

data/examples/fairchild.rb

@@ -0,0 +1,28 @@
+# Basic pool spec
+# Shows global settings for the clouds
+pool :application do
+  instances 1..3
+  ami 'ami-7cfd1a15'  
+  
+  cloud :example_one do
+    
+    has_directory "/var/www"
+    
+    has_file "/etc/motd", 
+      :content => "Welcome to LARubyConf"
+    has_file :name => "/var/www/index.html" do
+      content "<h1>Welcome to your new poolparty instance</h1>"
+      mode 0644
+      owner "www-data"
+    end
+    
+    has_git_repos "paparazzi" do
+      source "git://github.com/auser/paparazzi.git"
+      at "/var/www"
+    end
+    
+    apache
+    
+  end
+
+end

data/examples/fairchild_chef.rb

@@ -0,0 +1,19 @@
+# require "/etc/chef/cookbooks/chef-deploy/lib/chef-deploy.rb"
+include_recipe "apache2"
+include_recipe "passenger"
+include_recipe "rails"
+include_recipe "git"
+include_recipe "ec2"
+include_recipe "sqlite"
+
+# gem_package "sqlite3-ruby" do
+#   action :install
+# end
+
+web_app "paparazzi" do
+  docroot "/var/www/paparazzi/public"
+  template "paparazzi.conf.erb"
+  server_name "www.paparazzi.com"
+  server_aliases [node[:hostname], node[:fqdn], "paparazzi.com"]
+  rails_env "production"
+end

data/examples/maize.rb

@@ -0,0 +1,37 @@
+# Basic poolparty template
+
+pool :clouds do
+  cloud :app do
+    instances 1..3
+    # keypair "#{ENV['HOME']}/ec2/ec2-keypair.pem" # or the full path to the keypair on the development machine
+    ami 'ami-7cfd1a15'
+    using :vmrun do
+      vmx_hash({
+        "/Users/alerner/Documents/vm/Ubuntu32bitVM.vmwarevm/Ubuntu32bitVM.vmx" => "192.168.248.133"
+      })
+    end
+    
+    # directories
+    has_directory "/var/www"
+
+    # packages
+    has_package(:name => "logwatch")
+    has_package(:name => "imagemagick")
+    has_package(:name => "libmagick9-dev")
+    has_package(:name => "librmagick-ruby")
+    has_package(:name => "ffmpeg")
+    has_package(:name => "monit")
+
+    # gems
+    has_gem_package(:name => "rmagick")
+    has_gem_package(:name => "rubyist-aasm")
+    has_gem_package(:name => "rvideo")
+    has_gem_package(:name => "right_aws")
+    has_gem_package(:name => "ap4r")
+    has_gem_package(:name => "rmagick")
+    
+    # services
+    has_service(:name => "monit")
+  end
+
+end

data/examples/paparazzi.conf.erb

@@ -0,0 +1,21 @@
+<VirtualHost *:80>
+  ServerName <%= @params[:server_name] %>
+  ServerAlias <% @params[:server_aliases].each do |a| %><%= "#{a}" %> <% end %>
+  DocumentRoot <%= @params[:docroot] %>
+
+  RailsBaseURI /
+  RailsEnv <%= @params[:rails_env] %>
+  RailsAllowModRewrite on
+  PassengerMaxPoolSize <%= @node[:rails][:max_pool_size] %>
+
+  <Directory <%= @params[:docroot] %>>
+    Options FollowSymLinks
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+  </Directory>
+
+  LogLevel info
+  ErrorLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-error.log
+  CustomLog <%= @node[:apache][:log_dir] %>/<%= @params[:name] %>-access.log combined
+</VirtualHost>

data/generators/poolspec/poolspec_generator.rb

@@ -21,7 +21,7 @@ class PoolspecGenerator < RubiGen::Base
       m.directory ''
       BASEDIRS.each { |path| m.directory path }
       
-      m.template "pool_spec_template.erb", "#{@name}.pool"
+      m.template "pool_spec_template.erb", "clouds.rb"
       # Create stubs
       # m.template "template.rb",  "some_file_after_erb.rb"
       # m.template_copy_each ["template.rb", "template2.rb"]
@@ -31,14 +31,6 @@ class PoolspecGenerator < RubiGen::Base
   end
 
   protected
-    def banner
-      <<-EOS
-Creates a basic poolparty spec tempalte
-
-USAGE: #{spec.name} name
-EOS
-    end
-
     def add_options!(opts)
       opts.separator ''
       opts.separator 'Options:'

data/generators/poolspec/templates/pool_spec_template.erb

@@ -1,7 +1,6 @@
 # Basic poolparty template
 
 pool :<%= name -%> do
-  plugin_directory "#{File.dirname(__FILE__)}/plugins"
   
   cloud :app do
     instances 2..5

data/lib/poolparty/{aska/aska.rb → aska.rb}

@@ -5,23 +5,25 @@
 module Aska
   module ClassMethods
     def rules(name=:rules, arr=[], create_vars=true)
-      returning look_up_rules(name) do |rs|
-        arr.each do |line|
-          next unless line
-          rule = Rule.new(line)
-          next unless rule.valid?
-          k = rule.key
-          v = rule.var
-          m = rule.comparison
+      rs = look_up_rules(name)
+      # returning look_up_rules(name) do |rs|
+      arr.each do |line|
+        next unless line
+        rule = Rule.new(line)
+        next unless rule.valid?
+        k = rule.key
+        v = rule.var
+        m = rule.comparison
 
-          create_instance_variable(k, create_vars)
-          rs << {k => [m, v]}
-          rs << {k => [">", "0"]} unless rs.reject {|a| a.to_s == "#{k}>0" }
-        end
-        self.send(:define_method, name) do
-          look_up_rules(name)
-        end        
+        create_instance_variable(k, create_vars)
+        rs << {k => [m, v]}
+        rs << {k => [">", "0"]} unless rs.reject {|a| a.to_s == "#{k}>0" }
+      end
+      self.send(:define_method, name) do
+        look_up_rules(name)
       end
+      rs
+      # end
     end
     def create_instance_variable(k, create_vars=true)
       aska_attr_accessors << k.to_sym unless aska_attr_accessors.include?(k.to_sym)
@@ -63,7 +65,7 @@ module Aska
     end
     def valid_rule?(rule)
       rule.each do |key,value|
-        begin          
+        begin
           return __aska_send_value(key).send(value[0].to_sym, __aska_get_var(value[1]))
         rescue Exception => e
           return false
@@ -100,18 +102,7 @@ module Aska
     end
     
     def look_up_rules(r);self.class.look_up_rules(r);end
-    def are_rules?(r);self.class.are_rules?(r);end
-    
-    # def method_missing(m, *args, &block)
-    #   if self.class.defined_rules.has_key?(m.to_sym)
-    #     self.class.send(:define_method, m) do
-    #       self.class.look_up_rules(m)
-    #     end
-    #     self.send m
-    #   else
-    #     super
-    #   end
-    # end
+    def are_rules?(r);self.class.are_rules?(r);end    
   end
   
   def self.included(receiver)

data/lib/poolparty/base_packages/haproxy.rb

@@ -2,41 +2,58 @@ module PoolParty
   class Base
     plugin :haproxy do
       
+      def before_configure
+      end
+      
       def enable
-        execute_on_master do
-          has_package({:name => "haproxy"})
-
-          # Restart sysklogd after we update the haproxy.log
-          has_service(:name => "sysklogd")
-          
-          # Template variables          
-          has_variable(:name => "name_haproxy", :value => "#{cloud.name}")
-          has_variable(:name => "nodenames_haproxy", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'name', '-n', '#{cloud.name}')")
-          has_variable(:name => "node_ips_haproxy",  :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'ip', '-n', '#{cloud.name}')")
-          
-          has_variable(:name => "ports_haproxy", :value => ([(self.respond_to?(:port) ? port : Base.port)].flatten))        
-          has_variable(:name => "forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Base.forwarding_port))
-          has_variable(:name => "proxy_mode", :value => (respond_to?(:proxy_mode) ? proxy_mode : Base.proxy_mode))
-          
-          # Startup haproxy and enable it
-          has_line_in_file("ENABLED=1", "/etc/default/haproxy")
-          has_line_in_file("SYSLOGD=\"-r\"", "/etc/default/syslogd")
-          has_line_in_file("local0.* /var/log/haproxy.log", "/etc/syslog.conf", {:notify => get_service("sysklogd")})
+        # has_chef_recipe "apache2"
+        # include_chef_recipe "#{::File.dirname(__FILE__)}/../../../vendor/chef/apache2"
 
-          # Service is required
-          has_service(:name => "haproxy", :ensures => "running")
-          
-          # has_exec(:name => "reloadhaproxy", :command => "/etc/init.d/haproxy reload", :requires => get_package("haproxy"))
+        # Restart sysklogd after we update the haproxy.log
+        has_service(:name => "sysklogd")    
+        # Template variables
+        has_variable("haproxy_name", :value => "#{cloud.name}")
+        has_variable("listen_ports", :value => [ "8080" ], :namespace => "apache")
+        
+        has_variable("ports_haproxy", :value => ([(self.respond_to?(:port) ? port : Default.port)].flatten))        
+        has_variable("forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Default.forwarding_port))
+        has_variable("proxy_mode", :value => (respond_to?(:proxy_mode) ? proxy_mode : Default.proxy_mode))
+    
+        # Startup haproxy and enable it
+        has_line_in_file(:line => "ENABLED=1", :file => "/etc/default/haproxy")
+        has_line_in_file({:line => "SYSLOGD=\"-r\"", :file => "/etc/default/syslogd"})
+        has_line_in_file({:line => "local0.* /var/log/haproxy.log", :file => "/etc/syslog.conf"}, {:notify => get_service("sysklogd")})
+        has_file '/var/log/haproxy.log' do
+          content ''
+        end
+        
+        has_directory "/var/run/haproxy"
+        # has_package "apache2"
+        # has_service "apache2"
+        
+        has_package "haproxy" do
+          # stops get_service("apache2"), :immediately
+          # starts get_service("apache2")
+        end
 
-          # These can also be passed in via hash
-          has_remotefile(:name => "/etc/haproxy.cfg") do
-            mode 644
-            requires get_package("haproxy")
-            notify get_service("haproxy")
-            template File.join(File.dirname(__FILE__), "..", "templates/haproxy.conf")
-          end
+        has_exec "reloadhaproxy", 
+          :command => "/etc/init.d/haproxy reload", 
+          :ensures => "nothing",
+          :requires => get_package("haproxy")
+        
+        has_file "/etc/haproxy/haproxy.cfg" do
+          template "#{::File.dirname(__FILE__)}/../templates/haproxy.conf"
+          calls get_exec("reloadhaproxy")
+        end
+        
+        # Service is required
+        has_service("haproxy") do
+          action [:start, :enable]
+          # stops get_service("apache2"), :immediately
+          # starts get_service("apache2")
         end
+        
       end
-    end  
+    end
   end
 end

data/lib/poolparty/base_packages/heartbeat.rb

@@ -1,70 +1,14 @@
 module PoolParty
   class Base
-    plugin :heartbeat do
+    plugin :poolparty_base_heartbeat do
       
-      def enable
-        # execute_on_master do
-          has_package(:name => "heartbeat") do
-            has_service(:name => "heartbeat", :hasstatus => true, :hasrestart => true)
-            has_directory(:name => "/etc/ha.d")
-            
-            has_remotefile(:name => "/etc/ha.d/ha.cf") do
-              mode 444
-              notify service(:name => "heartbeat")
-              template File.join(File.dirname(__FILE__), "..", "templates/ha.cf")
-            end
-            
-            has_remotefile(:name => "/etc/ha.d/logd.cf") do
-              mode 600
-              notify service(:name => "heartbeat")
-              template File.join(File.dirname(__FILE__), "..", "templates/logd.cf")
-            end
-            
-            has_exec(:name => "heartbeat-update-cib", :command => "/usr/sbin/cibadmin -R -x /etc/ha.d/cib.xml", :refreshonly => true)
-        
-            has_remotefile(:name => "/etc/ha.d/authkeys") do
-              mode 600
-              notify service(:name => "heartbeat")
-              template File.join(File.dirname(__FILE__), "..", "templates/authkeys")
-            end
+      def enable        
+
+        has_package({:name => "heartbeat-2"})
+        has_package({:name => "heartbeat-2-dev"})
         
-            has_remotefile(:name => "/etc/ha.d/cib.xml") do
-              mode 444
-              notify exec(:name => "heartbeat-update-cib")
-              template File.join(File.dirname(__FILE__), "..", "templates/cib.xml")
-            end
-            
-            has_remotefile(:name => "/etc/ha.d/haresources") do
-              mode 644
-              template File.join(File.dirname(__FILE__), "..", "templates/haresources")
-            end
-          # end
-          
-          # variables for the templates
-          has_variable(:name => "ha_nodenames", :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'name', '-n', '#{cloud.name}')")
-          has_variable(:name => "ha_node_ips",  :value => "generate('/usr/bin/env', '/usr/bin/server-list-active', '-c', 'ip', '-n', '#{cloud.name}')")
-          
-          has_variable({:name => "ha_timeout",  :value => (self.respond_to?(:timeout) ? timeout : "5s")})
-          has_variable({:name => "ha_port", :value => (self.respond_to?(:port) ? port : Base.port)})
+        has_service("heartbeat")
           
-          # Finally, let's set a few options and start it
-#           has_exec(:name => "set and start") do
-#             refreshonly true
-#             command <<-EOC
-# crm_mon -i5            
-#             EOC
-#           end
-          
-        end
-        
-        # execute_on_master do
-        #   if list_of_node_names.size > 1
-        #     has_exec(:name => "update pem for heartbeat", :refreshonly => true) do
-        #       command "scp /etc/puppet/ssl/ca/ca_crl.pem #{user || Base.user}@#{list_of_node_ips[1]}:#{Base.base_config_directory}/ssl/ca"
-        #     end
-        #   end
-        # end
-        
       end
 
     end  

data/lib/poolparty/base_packages/poolparty.rb

@@ -2,113 +2,13 @@ module PoolParty
   class Base
     plugin :poolparty_base_packages do
       
-      def enable                
-        # Build hostsfile
-        
-        has_package(:name => "erlang")
-        has_package(:name => "erlang-dev")
-        has_package(:name => "erlang-src")
-        # has_package(:name => "yaws")
-        
-        has_package(:name => "rubygems") do
-          # These should be installed automagically by poolparty, but just in case
-          # TODO: Fix the requires method with a helper
-          has_gempackage(:name => "flexmock", :download_url => "http://rubyforge.org/frs/download.php/42580/flexmock-0.8.3.gem")
-          has_gempackage(:name => "lockfile", :download_url => "http://rubyforge.org/frs/download.php/18698/lockfile-1.4.3.gem")
-          has_gempackage(:name => "logging", :download_url => "http://rubyforge.org/frs/download.php/44731/logging-0.9.4.gem", :requires => [get_gempackage("flexmock"), get_gempackage("lockfile")])          
-          
-          has_gempackage(:name => "rubyforge", :download_url => "http://rubyforge.org/frs/download.php/45546/rubyforge-1.0.1.gem")
-          has_gempackage(:name => "hoe", :download_url => "http://rubyforge.org/frs/download.php/45685/hoe-1.8.2.gem", :version => "1.8", :requires => get_gempackage("rubyforge"))
-          has_gempackage(:name => "ZenTest", :download_url => "http://rubyforge.org/frs/download.php/45581/ZenTest-3.11.0.gem", :requires => [get_gempackage("hoe"), get_gempackage("rubyforge")])
-          
-          has_gempackage(:name => "rake", :download_url => "http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem")
-          has_gempackage(:name => "xml-simple", :download_url => "http://rubyforge.org/frs/download.php/18366/xml-simple-1.0.11.gem")
-          has_gempackage(:name => "amazon-ec2", :download_url => "http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem", :requires => get_gempackage("xml-simple"))
-          
-          has_gempackage(:name => "sexp_processor", :download_url => "http://rubyforge.org/frs/download.php/45589/sexp_processor-3.0.0.gem")
-          has_gempackage(:name => "ParseTree", :download_url => "http://rubyforge.org/frs/download.php/45600/ParseTree-3.0.1.gem", :requires => [get_gempackage("sexp_processor"), get_gempackage("ZenTest")])
-            
-          has_gempackage(:name => "ruby2ruby", :download_url => "http://rubyforge.org/frs/download.php/45587/ruby2ruby-1.2.0.gem", :requires => get_gempackage("ParseTree"))
-          
-          has_gempackage(:name => "activesupport", :download_url => "http://rubyforge.org/frs/download.php/45627/activesupport-2.1.2.gem")
- 
-          has_gempackage(:name => "RubyInline", :download_url => "http://rubyforge.org/frs/download.php/45683/RubyInline-3.8.1.gem")
-          
-          has_gempackage(:name => "poolparty", :download_url => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=true", :requires => [get_gempackage("ruby2ruby"), get_gempackage("RubyInline"), get_gempackage("ParseTree")])
-          
-          # , :ifnot => "/bin/ps aux | /bin/grep -q pm_node"
-          # has_runit_service("pm_node", "pm_node", File.join(File.dirname(__FILE__), "..", "templates/messenger/node/"))
+      def enable        
+        has_cron "/usr/bin/server-manage-election" do
+          minute "0,5,10,15,20,25,30,35,40,45,50,55"
+          command "/usr/bin/server-manage-election"
         end
-        
-        has_exec(:name => "build_messenger", :command => ". /etc/profile && server-build-messenger")
-        has_exec(:name => "start_node", :command => ". /etc/profile && server-start-node")        
-        
-        # execute_on_node do
-        has_remotefile(:name => "/usr/bin/puppetrunner") do
-          mode 744
-          template File.join(File.dirname(__FILE__), "..", "templates/puppetrunner")
-        end
-        
-        # execute_on_node do
-          has_cron(:name => "node puppetd runner", :user => Base.user, :minute => "*/15") do
-            requires get_gempackage("poolparty")
-            command "/usr/bin/puppetrunner"
-          end
-        # end
-        
-        # end
-        
-        # Cloud panel setup
-        
-        # 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
-        
-        # Custom run puppet to minimize footprint
-        # TODO: Update the offsetted times
-        has_remotefile(:name => "/usr/bin/puppetrerun") do
-          mode 744
-          template File.join(File.dirname(__FILE__), "..", "templates/puppetrerun")
-        end
-        
-        has_remotefile(:name => "/usr/bin/puppetcleaner") do
-          mode 744
-          template File.join(File.dirname(__FILE__), "..", "templates/puppetcleaner")
-        end
-        
-        execute_on_master do
-          has_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts -n #{cloud.name}")
-          
-          # has_cron(:name => "master puppetd runner", :user => Base.user, :minute => "*/15") do
-          #   requires get_gempackage("poolparty")
-          #   command(PoolParty::Remote::RemoteInstance.puppet_runner_command)
-          # end
-          has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
-            requires get_gempackage("poolparty")
-            command(". /etc/profile && cloud-handle-load -n #{cloud.name}")
-          end
-          has_cron(:name => "provisioning ensurer", :user => Base.user, :minute => "*/2") do
-            requires get_gempackage("poolparty")
-            command ". /etc/profile && cloud-ensure-provisioning -n #{cloud.name}"
-          end
-          # has_runit_service("client_server", "pm_client", File.join(File.dirname(__FILE__), "..", "templates/messenger/client/"))
-          # has_runit_service("master_server", "pm_master", File.join(File.dirname(__FILE__), "..", "templates/messenger/master/"))
-          # TODO: Update this so it only runs when needed          
-          # has_customservice(:name => "start master server", :pattern => "/pm_master/", :bin => ". /etc/profile && server-start-master")
-          # has_customservice(:name => "start client server", :pattern => "/client_service/", :bin => ". /etc/profile && server-start-client")                    
-          has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master") #, :ifnot => "/bin/ps aux | /bin/grep -q pm_master"
-          has_exec(:name => "start client server", :command => ". /etc/profile && server-start-client") #, :ifnot => "/bin/ps aux | /bin/grep -q client_server"
-          
-          has_cron({:name => "maintain script", :command => ". /etc/profile && cloud-maintain -n #{cloud.name}", :minute => "*/3", :requires => [get_gempackage("poolparty"), get_cron("puppetd runner"), get_cron("Load handler"), get_service("haproxy")]})
-          
-          has_cron(:name => "ensure puppetmaster is running", :command => ". /etc/profile && puppetmasterd --verbose", :hour => "0")
-          
-        end        
-        # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)
       end
       
-    end  
+    end
   end
 end

data/lib/poolparty/base_packages/ruby.rb

@@ -1,8 +1,8 @@
 module PoolParty
   class Base
-    plugin :ruby do
+    plugin :poolparty_base_ruby do
       
-      def enable                
+      def enable
         install_base_packages
       end
       
@@ -10,9 +10,9 @@ module PoolParty
         has_package(:name => "libreadline-ruby1.8")
         has_package(:name => "libruby1.8")                
         has_package(:name => "ruby1.8-dev")
-        has_package(:name => "ruby1.8")        
+        has_package(:name => "ruby1.8")
         
-        has_line_in_file("export PATH=$PATH:/var/lib/gems/1.8/bin:/sbin", "/etc/profile")
+        has_line_in_file(:line => "export PATH=$PATH:/var/lib/gems/1.8/bin", :file => "/etc/profile")
         
         # exec(:name => "update-rubygems") do
         #   command "gem update --system"

data/lib/poolparty/base_packages/runit.rb

@@ -4,7 +4,7 @@
 =end
 module PoolParty
   class Base
-    plugin :runit do
+    plugin :poolparty_base_runit do
       
       def enable
         unless enabled