auser-poolparty 1.2.8 → 1.2.9

data/lib/poolparty/net/init.rb

@@ -5,17 +5,10 @@ class Object
   end
 end
 
-# Load the core net libraries.  These are neccessary for any of the remoter_bases to function.
-%w(remote_instance remoter_base).each do |file|
-  require File.join(::File.dirname(__FILE__),file+'.rb')
-end
-# 
-# # Register available remoter_bases
-# Dir["#{::File.dirname(__FILE__)}/remoter_bases/*/*.rb"].each do |base| 
-#   name = File.join(::File.basename(base, ::File.extname(base)))
-#   require base
-# end
-
+# Load the core net libraries.
+# These are neccessary for any of the remoter_bases to function.
+require ::File.join(::File.dirname(__FILE__),'remoter_base.rb')
+require ::File.join(::File.dirname(__FILE__),'remote_instance.rb')
 
 Dir["#{::File.dirname(__FILE__)}/remoter_bases/*/*.rb"].each do |base|
   name = ::File.basename(base, ::File.extname(base))

data/lib/poolparty/net/remote_instance.rb

@@ -7,6 +7,7 @@ module PoolParty
       dsl_methods :name,        # Name of the remote instance (internal usage)
                   :ip,          # Ip of the remote instance
                   :internal_ip, # Internal ip of the remote instance
+                  :public_ip,
                   :status       # Status of the remote instance
       
       def initialize(opts={})
@@ -64,6 +65,10 @@ module PoolParty
         "#{name}\t#{ip}\t#{instance_id rescue ""}"
       end
       
+      def has_key?(key)
+        dsl_options.has_key?(key)
+      end
+      
       # Class method to disect a neighborhood line
       def self.hash_from_s(s)
         arr = s.split("\t")

data/lib/poolparty/net/remoter/connections.rb

@@ -9,7 +9,7 @@ module PoolParty
     def target_host(dns_or_ip=nil)
       dns_or_ip ? @target_host=dns_or_ip : @target_host
     end
-  
+    
     # Simply shell out and call ssh, simple, reliable and fewest dependencies, but slow
     def simplest_run_remote(host=target_host, command=[], extra_ssh_ops={})
       command = command.compact.join(' && ') if command.is_a? Array
@@ -34,19 +34,20 @@ module PoolParty
            }.merge(opts)
       o.collect{ |k,v| "#{k} #{v}"}.join(' ')
     end
-  
+    
     def rsync( source_path, destination_path, rsync_opts=['-v -a'] )
       dputs "rsync -e 'ssh #{ssh_options}' #{rsync_opts.join(' ')} #{source_path}  root@#{target_host}:#{destination_path}"
       out = %x{ rsync -e 'ssh #{ssh_options}' #{rsync_opts.join(' ')} #{source_path}  root@#{target_host}:#{destination_path} }
       puts out if debugging?
     end
-   
+    
+    # Run commands on the local machine, i.e. your laptop, not the server
     def run_local(commands)
       commands.each do |cmd|
         puts `#{cmd}`
       end
     end
-
+    
     def commands
       @commands ||= Array.new
     end
@@ -60,15 +61,17 @@ module PoolParty
     end
     
     def netssh(cmds=[], opts={})
-      user = opts.delete(:user) || user #rescue 'root'
+      user = opts.delete(:user) || 'root' #user rescue 'root'
       host = opts.delete(:host) || target_host
-      ssh_options_hash = {:keys => [keypair.full_filepath],
+      ssh_options_hash = {:keys         => [keypair.full_filepath],
                           :auth_methods => 'publickey',
-                          :paranoid => false
+                          :paranoid     => false,
+                          :timeout      => 3.minutes,
+                          :user         => user
                            }.merge(opts)
-      
-      # Start the connection
-      Net::SSH.start(host, user, ssh_options_hash) do |ssh|  
+      ssh_options_hash[:verbose]=:debug if debugging?
+      puts "connecting to ssh with options = #{ssh_options_hash.inspect}"
+      Net::SSH.start(host, user, ssh_options_hash) do |ssh|
         cmds.each do |command|
           ssh.exec!(command) do |ch, stream, data|
             if stream == :stdout
@@ -82,7 +85,7 @@ module PoolParty
     end
     
     
-##########################################################################################################   
+##########################################################################################
 # TODO: Delete deprecated commands below here
     
     def rsync_storage_files_to_command(remote_instance)

data/lib/poolparty/net/remoter/interactive.rb

@@ -2,8 +2,19 @@ module PoolParty
   module Remote
     
     # Select a list of instances based on their status
-    def nodes(hsh={}, with_neighborhood_default=true)
-      list_of_instances(with_neighborhood_default).select_with_hash(hsh)
+    def nodes(hsh={}, with_neighborhood_default=false)
+      if with_neighborhood_default
+        list_of_instances(with_neighborhood_default).select_with_hash(hsh)
+      else
+        key_condition = {:key_name => (hsh[:key_name] ||self.key_name || keypair.basename) }
+        # if hsh.delete(:uncached)
+        #   @nodes = describe_instances.select_with_hash(conditions)
+        # else
+        #   @nodes ||= describe_instances.select_with_hash(conditions)
+        # end
+        results = describe_instances.select_with_hash(key_condition)
+        results.select_with_hash(hsh)
+      end
     end
     
     # Select the list of instances, either based on the neighborhoods

data/lib/poolparty/net/remoter_base.rb

@@ -33,7 +33,7 @@ module PoolParty
       def initialize(opts={}, &block)
         opts.each {|k,v| opts[k] = v.call if v.respond_to?(:call) }
         set_vars_from_options opts
-        instance_eval &block if block
+        instance_eval(&block) if block
       end
       
       def cloud(n=nil)
@@ -58,14 +58,13 @@ module PoolParty
       # end
       
       def self.available_bases
-        @available_bases ||= []        
+        @available_bases ||= []
       end
       def self.inherited(arg)
         base_name = "#{arg}".downcase.top_level_class.to_sym
         (available_bases << base_name) unless available_bases.include?(base_name)
-        (remote_bases << base_name) unless remote_bases.include?(base_name)
+        (remote_bases << base_name) unless remote_bases.include?(base_name)  #TODO: Deprecate
       end
-
       
       # def method_missing(meth, *args, &block)
       #   if @cloud
@@ -115,8 +114,14 @@ module PoolParty
       
       # TODO: Rename and modularize the @inst.status =~ /pending/ so that it works on all 
       # remoter_bases
+      # 1.) Launches a new instance, 
+      # 2.) Waits for the instance to get an ip address
+      # 3.) Waits for port 22 to be open
+      # 4.) Calls call_after_launch_instance callbacks
+      # 5.) Executes passes block, if any
       def launch_instance!(o={}, &block)
         @cloud = clouds[o[:cloud_name] || o[:name]]
+        o[:keypair_name] = @cloud.keypair.basename
         @inst = launch_new_instance!( dsl_options.merge(o) )
         sleep(2)
         

data/lib/poolparty/net/remoter_bases/ec2/ec2.rb

@@ -35,30 +35,33 @@ end
 module PoolParty    
   module Remote
     class Ec2 < Remote::RemoterBase
+      require "#{::File.dirname(__FILE__)}/ec2_remote_instance"
       
       dsl_methods :elastic_ips,           # An array of the elastic ips
                   :ebs_volume_id         # The volume id of an ebs volume
       
       default_options({
-        :image_id => 'ami-bf5eb9d6',
+        :image_id           => 'ami-bf5eb9d6',
+        :ami                => 'ami-bf5eb9d6',  #Deprecated, but here for backwards compatability
         # :key_name => ::File.basename(keypair.is_a?(String) ? keypair : keypair.full_filepath),
-        :instance_type => 'm1.small', # or 'm1.large', 'm1.xlarge', 'c1.medium', or 'c1.xlarge'
-        :addressing_type => "public",
-        :availability_zone => "us-east-1a",
-        :access_key => ENV['AWS_ACCESS_KEY'],
-        :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'],
-        :security_group => ["default"],
-        :keypair_name =>nil
+        :instance_type      => 'm1.small', # or 'm1.large', 'm1.xlarge', 'c1.medium', or 'c1.xlarge'
+        :addressing_type    => "public",
+        :availability_zone  => "us-east-1a",
+        :access_key         => ENV['AWS_ACCESS_KEY'],
+        :secret_access_key  => ENV['AWS_SECRET_ACCESS_KEY'],
+        :security_group     => ["default"],
+        :keypair_name       => nil,
+        :key_name           => nil
         })
         
       # alias to image_id
-      def ami(n=nil)
-        if n.nil?
-          image_id
-        else
-          image_id n
-        end
-      end
+      # def ami(n=nil)
+      #   if n.nil?
+      #     image_id
+      #   else
+      #     image_id n
+      #   end
+      # end
       
       # Requires a hash of options
       def self.launch_new_instance!(o)
@@ -69,7 +72,8 @@ module PoolParty
       # Start a new instance with the given options
       def launch_new_instance!(o={})
         set_vars_from_options o
-        raise "You must pass a keypair to launch an instance, or else you will not be able to login. options = #{o.inspect}" if !keypair
+        keypair_name ||= o[:keypair_name] || keypair || (clouds[o[:cloud_name]].keypair.basename if o[:cloud_name])
+        raise "You must pass a keypair to launch an instance, or else you will not be able to login. options = #{o.inspect}" if !keypair_name 
         o.merge!( dsl_options.merge(:key_name=>keypair_name) )
         instance = ec2(o).run_instances(o)
         begin
@@ -81,36 +85,47 @@ module PoolParty
         end
         h
       end
+      
       # Terminate an instance by id
       def terminate_instance!(o={})
         ec2(o).terminate_instances(:instance_id => o[:instance_id])
       end
+      
       # Describe an instance's status
       def describe_instance(o={})
-        return describe_instances.first if o[:instance_id].nil?
+        return describe_instances.first if o.empty? || o[:instance_id].nil?
         describe_instances.detect {|a| a[:name] == o[:instance_id] || a[:ip] == o[:instance_id] || a[:instance_id] == o[:instance_id] }
       end
-      # TODO: Clean up this method and remove hostnames
+      
       def describe_instances(o={})
-        id = 0
-        set_vars_from_options(dsl_options.merge(o))
-        get_instances_description(dsl_options).each_with_index do |h,i|
-          if h[:status] == "running"
-            inst_name = id == 0 ? "master" : "node#{id}"
-            id += 1
-          else
-            inst_name = "#{h[:status]}_node#{i}"
-          end
-          h.merge!({
-            :name => inst_name,
-            :hostname => h[:ip],
-            :ip => h[:ip].convert_from_ec2_to_ip,
-            :index => i,  #TODO get the instance id from the aws result instead
-            :launching_time => (h[:launching_time])
-          })
-        end.compact.sort {|a,b| a[:index] <=> b[:index] }
+        ec2_instants = EC2ResponseObject.describe_instances(ec2.describe_instances)
+        insts = ec2_instants.select_with_hash(o) if !o.empty?
+        ec2_remote_instances = ec2_instants.collect{|i| Ec2RemoteInstance.new(i)}
+        ec2_remote_instances.sort {|a,b| a[:ami_launch_index] <=> b[:ami_launch_index] }
       end
       
+      # TODO: Clean up this method and remove hostnames
+      # def describe_instances(o={})
+      #   id = 0
+      #   set_vars_from_options(dsl_options.merge(o))
+      #   get_instances_description(dsl_options).each_with_index do |h,i|
+      #     if h[:status] == "running"
+      #       inst_name = id == 0 ? "master" : "node#{id}"
+      #       id += 1
+      #     else
+      #       inst_name = "#{h[:status]}_node#{i}"
+      #     end
+      #     h.merge!({
+      #       :name           => inst_name,
+      #       :hostname       => h[:ip],
+      #       :ip             => h[:ip].convert_from_ec2_to_ip,
+      #       # :internal_ip    => h.ip
+      #       :index          => i,  #TODO get the instance id from the aws result instead
+      #       :launching_time => (h[:launching_time])
+      #     })
+      #   end.compact.sort {|a,b| a[:index] <=> b[:index] }
+      # end
+      
       # ===================================
       # = Ec2 Specific methods below here =
       # ===================================

data/lib/poolparty/net/remoter_bases/ec2/ec2_remote_instance.rb

@@ -3,10 +3,24 @@ module PoolParty
   module Remote
     class Ec2RemoteInstance < RemoteInstance
       include Dslify
+      include Remote
       
-      attr_reader :uniquely_identifiable_by, :found_at
+      default_options({
+        # :launching_time   => Time.now,
+        :dns_name         => nil,
+        :private_dns_name => nil,
+        :key_name         => nil,
+        :kernel_id        => nil,
+        :ramdisk_id       => nil,
+        :launch_time      => nil,
+        :instance_id      => nil,
+        :ami_launch_index => nil,
+        :ip               => nil,
+        :public_ip        => nil,
+        :internal_ip      => nil
+        }.merge(Remote::Ec2.default_options) )
       
-      default_options( {:launching_time => Time.now}.merge(Remote::Ec2.default_options) )
+      @uniquely_identifiable_by = [:ip, :name, :dns_name, :instance_id]
       
       # A new instance will be created from the passed in hash.  
       # This hash of passed in values will be converted to methods on this instance.
@@ -14,11 +28,38 @@ module PoolParty
       # If an instance is found, this instance's properties will be set to the properties provided
       # If the found instance has properties of the same key as the provided options, the found instance's values will override the passed in options
       def initialize(opts={})
-        @uniquely_identifiable_by = [:ip, :name, :dns_name, :instance_id]
-        @original_options = opts
-        super(opts)
+        set_vars_from_options(opts) if opts.is_a?(Hash)
+        @target_host = public_ip || internal_ip || ip  #set this for the netssh commands
+        # super(opts)
+      end
+      
+      def keypair(*n)
+        @keypair ||= Key.new(key_name)
+      end
+      
+      ## hash like methods
+      # TODO: move these into a module, or into dslify
+      # include Enumerable
+      def each
+        dsl_options.each{ |k,v| yield k,v }
+      end
+      def [](k)
+        dsl_options[k]
+      end
+      
+      def []=(k,v)
+        dsl_options[k] = v
+      end
+      
+      def keys
+        dsl_options.keys
       end
          
+      def values
+        dsl_options.values
+      end
+      ##end of hash like methods
+      
       # Is this instance running?
       def running?
         !(status =~ /running/).nil?

data/lib/poolparty/net/remoter_bases/ec2/ec2_response_object.rb

@@ -50,6 +50,7 @@ class EC2ResponseObject
     group
   end
   def self.get_hash_from_response(resp, group = 'default')
+      symbolize_and_snakecase
       {
         :instance_id => resp.instanceId,
         :name => resp.instanceId,
@@ -60,6 +61,61 @@ class EC2ResponseObject
         :launching_time => resp.launchTime.parse_datetime,
         :keypair => (resp.keyName rescue ""),
         :security_group => group
-      }        
+      }
   end
+  
+  #####
+  
+  # Convert the standard reponse into output similar to this example
+  # {:dns_name=>"ec2-75-101-175-49.compute-1.amazonaws.com",
+  #  :private_dns_name=>"domU-11-31-39-00-DC-78.compute-1.internal",
+  #  :reason=>nil,
+  #  :instance_state=>{"name"=>"running", "code"=>"16"},
+  #  :kernel_id=>"aki-a71cf9ce",
+  #  :ramdisk_id=>"ari-a51cf9cc",
+  #  :placement=>{"availabilityZone"=>"us-east-1a"},
+  #  :product_codes=>nil,
+  #  :image_id=>"ami-bf5eb9d6",
+  #  :launch_time=>"2009-05-29T05:07:09.000Z",
+  #  :key_name=>"poolname_cloudname",
+  #  :instance_id=>"i-1b7b2942",
+  #  :ami_launch_index=>"0",
+  #  :instance_type=>"m1.small"}
+  #
+  # Selects the first instance if an index is not given.
+  def self.describe_instance(response, index=0)
+    inst=response['reservationSet']['item'].first['instancesSet']['item'][index]
+    Ec2RemoteInstance.new(symbolize_and_snakecase(inst))
+  end
+  
+  def self.describe_instances(response)
+    return [] if response['reservationSet'].nil?
+    ec2_insts = response['reservationSet']['item'].collect do |ri|
+      ri['instancesSet']['item'].collect{|i| i}
+    end
+    ec2_insts.flatten.collect {|i| symbolize_and_snakecase(i) }
+  end
+  
+  # Convert the standard response hash to format used throughout the rest of PoolParty code.
+  # And add in some more values we rely on
+  def self.symbolize_and_snakecase(inst)
+    n = inst.symbolize_keys(:snake_case)
+    n[:internal_ip] = convert_from_ec2_dns_to_ip(n[:private_dns_name])
+    n[:public_ip]   = convert_from_ec2_dns_to_ip(n[:dns_name])
+    n[:ip]          = n[:public_ip]
+    n[:launch_time] = parse_datetime(n[:launch_time])
+    n[:status]      = n[:instance_state][:name]
+    n[:availability_zone] = n[:placement][:availability_zone]
+    n
+  end
+  
+  def self.convert_from_ec2_dns_to_ip(str)
+    return nil if str.nil?
+    str.scan(/-(\d{1,3})-(\d{1,3})-(\d{1,3})-(\d{1,3})/).flatten.join('.')
+  end
+  
+  def self.parse_datetime(str)
+    DateTime.parse( str.chomp ) rescue self
+  end
+  
 end

data/lib/poolparty/plugins/apache2/apache.rb

@@ -1,5 +1,5 @@
 module PoolParty
-  class Base
+  module Plugin
 
 =begin rdoc
 
@@ -10,10 +10,12 @@ host. This means apache will not start up unless you specify at least the
 default host. 
 
 =end
-
-    plugin :apache do
+    class Apache < Plugin
       dsl_methods :passenger_version
       
+      default_options :port     => 80,
+                      :www_user => 'www-data'
+      
       def loaded(opts={}, &block)
         configs
         has_service("apache2", :requires => get_package("apache2"))
@@ -27,29 +29,25 @@ default host.
         install
       end
       
-      def www_user(www_user_name='www-data')
-        www_user_name
-      end
-            
       def install
         installed_as_worker
       end
       
-      def installed_as_worker            
+      def installed_as_worker
         unless @installed_as_worker
           has_package("apache2")
           has_package("apache2-mpm-worker")
 
           base_install
           @installed_as_worker = true
-        end            
+        end
       end
 
-      def base_install        
+      def base_install
         unless @base_install
           has_exec({:name => "restart-apache2", :command => "/etc/init.d/apache2 restart", :action => :nothing})
           has_exec({:name => "reload-apache2", :command => "/etc/init.d/apache2 reload", :action => :nothing})
-          has_exec({:name => "force-reload-apache2", :command => "/etc/init.d/apache2 force-reload", :action => :nothing})          
+          has_exec({:name => "force-reload-apache2", :command => "/etc/init.d/apache2 force-reload", :action => :nothing})
           @base_install = true
         end
       end
@@ -125,7 +123,7 @@ default host.
       
       def configs
         unless @configs
-          listen unless @listen
+          listen(port) unless @listen
           has_directory("/etc/apache2")
           has_directory("/etc/apache2/conf.d")
           has_directory("/etc/apache2/site-includes")
@@ -168,6 +166,7 @@ default host.
       
       def listen(p="80")
         has_variable(:name => "port", :value => p)
+        self.port = p
         @listen = true
       end
       
@@ -212,126 +211,14 @@ default host.
           has_exec({:name => "no-mod-#{name}"}, :command => "/usr/sbin/a2dismod #{name}") do
             requires get_package("apache2")
             if_not "/bin/sh -c \'[ -L /etc/apache2/mods-enabled/#{name}.load ] && [ /etc/apache2/mods-enabled/#{name}.load -ef /etc/apache2/mods-available/#{name}.load ]\'"
-    				calls get_exec("force-reload-apache2")
+            calls get_exec("force-reload-apache2")
           end
         end
       end
       
     end
 
-  virtual_resource(:virtualhost) do
-    def listen(port="80")
-      has_variable(:name => "port", :value => port)
-      port port
-    end
-        
-    def virtual_host_entry(file)
-      @virtual_host_entry = true
-      if ::File.file?(file)
-        has_file(dsl_options.merge({:name => "/etc/apache2/sites-available/#{name}", 
-                                :template => file, 
-                                :requires => get_package("apache2")}))
-      else
-        has_file(dsl_options.merge({:content => file, 
-                                :name => "/etc/apache2/sites-available/#{name}", 
-                                :requires => get_package("apache2")}))
-      end
-    end
-
-    
-    def loaded(opts={}, parent=self)
-      has_directory(:name => "/var/www", :owner => www_user, :mode=>'0744')
-      has_directory(:name => "/var/www/#{name}", :owner => www_user, :mode=>'0744')
-      has_directory(:name => "/var/www/#{name}/logs", :owner => www_user, :mode=>'0744')
-
-      has_variable(:name => "sitename", :value => "#{name}")
-
-      unless @virtual_host_entry
-        virtual_host_entry <<-eof
-<VirtualHost *:#{port}> 
-ServerName     #{name}
-DocumentRoot   /var/www/#{name}
-</VirtualHost>
-eof
-      end
-      
-      has_exec(:name => "insert-site-#{name}", 
-               :command => "/usr/sbin/a2ensite #{name}", 
-               :calls => get_exec("reload-apache2"), 
-               :requires => get_file("/etc/apache2/sites-available/#{name}")) do
-        requires get_package("apache2")
-        if_not "/bin/sh -c '[ -L /etc/apache2/sites-enabled/#{parent.name} ] && [ /etc/apache2/sites-enabled/#{parent.name} -ef /etc/apache2/sites-available/#{parent.name} ]'"
-      end
-    end
-
-  end
-  
-  virtual_resource(:passengersite) do    # {{{
-
-    default_options(
-      :dir            => "/var/www",
-      :appended_path  => nil,
-      :owner          => 'www-data', 
-      :mode           =>'0744',
-      :enviornment    => 'production'
-    )
-
-    def loaded(opts={}, prnt=nil)
-      enable_passenger
-      port "80" unless self.port
-      
-      has_directory(:name => dir,                   :owner => www_user, :mode => '0744')
-      has_directory(:name => "#{site_directory}",      :owner => www_user, :mode => '0744')
-      has_directory(:name => "#{site_directory}/logs", :owner => www_user, :mode => '0744')
-      if opts[:with_deployment_directories]
-        has_directory(:name => "#{site_directory}/shared", :owner => www_user, :mode=>'0744')
-        has_directory(:name => "#{site_directory}/shared/public", :owner => www_user, :mode=>'0744')
-        has_directory(:name => "#{site_directory}/shared/config", :owner => www_user, :mode=>'0744')
-        has_directory(:name => "#{site_directory}/shared/log", :owner => www_user, :mode=>'0744')
-        has_directory(:name => "#{site_directory}/releases", :owner => www_user, :mode=>'0744')
-        do_once do |variable|
-          # setup an initial symlink so apache will start even if there have not been any deploys yet
-          has_directory(:name => "#{site_directory}/releases/initial/public", :owner => www_user, :mode=>'0744')
-          #FIXME  the following line is chef specific.  It will fail with puppet
-          
-          # has_symlink(:target_file => "#{dir}/#{name}/current", :to => "#{dir}/#{name}/releases/initial")
-        end        
-        log_dir = "#{site_directory}/shared/log"
-        appended_path "current"
-      else
-        log_dir = "#{site_directory}/log"
-      end
-      
-      passenger_entry <<-EOE
-<VirtualHost *:#{port}>
-    ServerName #{name}
-    DocumentRoot #{site_directory}/public
-    RailsEnv #{enviornment}
-    ErrorLog #{log_dir}/error_log
-    CustomLog #{log_dir}/access_log common
-</VirtualHost>
-      EOE
-      
-      # has_directory(:name => "/var/www")
-      # has_directory(:name => "/var/www/#{name}")
-      # has_directory(:name => "/var/www/#{name}/log")
-      parent.install_site(name, :no_file => true) # we already created the file with #passenger_entry
-    end
-
-    def passenger_entry(file)
-      if ::File.file?(file)
-        has_file({:name => "/etc/apache2/sites-available/#{name}", :template => file})
-      else
-        has_file({:content => file, :name => "/etc/apache2/sites-available/#{name}" })
-      end
-    end
-
-    def site_directory
-      "#{dir}/#{name}%s" % [appended_path ? "/" + appended_path : ""]
-    end
-  end
-  
-#   virtual_resource(:passengersite_with_ssl) do# {{{
+#   plugin(:passengersite_with_ssl) do# {{{
 #     def loaded(opts={}, parent=self)
 #       enable_passenger
 
@@ -374,40 +261,6 @@ eof
 #   end
 # }}}
 
-    # Usage: 
-    # 
-    # enable_php5 do
-    #   extras :cli, :pspell, :mysql
-    # end
-    virtual_resource(:enable_php5) do
-      def loaded(opts={}, parent=self)
-        has_package(:name => "php5")
-        has_package(:name => "libapache2-mod-php5")
-        present_apache_module("php5")
-        has_file({:name => "/etc/php5/apache2/php.ini",
-                :template => "apache2/php.ini.erb",
-                :mode => 755,
-                :requires => get_package("libapache2-mod-php5"),
-                :calls => get_exec("reload-apache2")})
-
-        has_file(:name => "/etc/apache2/conf.d/enable-php.conf", 
-                 :mode => 755,
-                 :calls => get_exec("reload-apache2"),
-                 :content => <<-eos 
-                 AddHandler php5-script php
-                 AddType text/html       php
-                 eos
-                 )
-      end
-
-      def extras(*names)
-        names.each do |name|
-         has_package(:name => "php5-#{name}", :requires => get_package("php5"))
-        end
-      end
-
-    end
-
   end
 
 end