poolparty 0.2.84 → 1.2.2

data/lib/poolparty/net/remoter_bases/vmrun/utilities/vmx_file.rb

@@ -0,0 +1,117 @@
+class VmxFile
+  include Dslify
+  
+  default_options(
+    ".encoding" => "UTF-8",
+    "config.version" => "8",
+    "virtualHW.version" => "6",
+    "guestOS" => "other26xlinux",
+    "displayName" => "PoolParty vmx",
+    "vumvcpus" => "1",
+    "memsize" => "256",
+    "MemAllowAutoScaleDown" => "TRUE",
+    "MemTrimRate" => "-1",
+    "gui.powerOnAtStartup" => "FALSE",
+    "gui.fullScreenAtPowerOn" => "FALSE",
+    "gui.exitAtPowerOff" => "FALSE",
+    "uuid.action" => "create",
+    # Settings for VMware Tools
+    "tools.remindInstall" => "FALSE",
+    "tools.upgrade.policy" => "upgradeAtPowerCycle",
+    # Startup hints interfers with automatic startup of a virtual machine
+    # This setting has no effect in VMware Player
+    "hints.hideAll" => "TRUE",
+
+    # Enable time synchronization between computer
+    # and virtual machine
+    "tools.syncTime" => "TRUE",
+
+    # USB settings
+    # This config activates USB
+    "usb.present" => "TRUE",
+    "usb.generic.autoconnect" => "FALSE",
+
+    # First serial port, physical COM1 is available
+    "serial0.present" => "FALSE",
+    "serial0.fileName" => "Auto Detect",
+    "serial0.autodetect" => "TRUE",
+    "serial0.hardwareFlowControl" => "TRUE",
+
+    # Optional second serial port, physical COM2 is not available
+    "serial1.present" => "FALSE",
+
+    # First parallel port, physical LPT1 is available
+    "parallel0.present" => "FALSE",
+    "parallel0.fileName" => "Auto Detect",
+    "parallel0.autodetect" => "TRUE",
+    "parallel0.bidirectional" => "TRUE",
+
+    # Sound settings
+    "sound.present" => "TRUE",
+    "sound.fileName" => "-1",
+    "sound.autodetect" => "TRUE",
+
+    # Logging
+    # This config activates logging, and keeps last log
+    "logging" => "TRUE",
+    "log.fileName" => "PoolParty.log",
+    "log.append" => "TRUE",
+    "log.keepOld" => "3",
+
+    # These settings decides interaction between your
+    # computer and the virtual machine
+    "isolation.tools.hgfs.disable" => "FALSE",
+    "isolation.tools.dnd.disable" => "FALSE",
+    "isolation.tools.copy.enable" => "TRUE",
+    "isolation.tools.paste.enabled" => "TRUE",
+
+    # Other default settings
+    "svga.autodetect" => "TRUE",
+    "mks.keyboardFilter" => "allow",
+    "snapshot.action" => "autoCommit",
+
+    # First network interface card
+    "ethernet0.present" => "TRUE",
+    "ethernet0.virtualDev" => "vlance",
+    "ethernet0.connectionType" => "nat",
+    "ethernet0.addressType" => "generated",
+    "ethernet0.generatedAddressOffset" => "0",
+
+    # Settings for physical floppy drive
+    "floppy0.present" => "FALSE",
+
+    # First IDE disk, size 4800Mb
+    "ide0:0.present" => "TRUE",
+    "ide0:0.fileName" => "PoolParty.vmdk",
+    "ide0:0.mode" => "persistent",
+    "ide0:0.startConnected" => "TRUE",
+    "ide0:0.writeThrough" => "TRUE",
+    
+    "checkpoint.vmState" => "",
+    "ethernet0.generatedAddress" => "00:0c:29:73:79:fb",
+    "virtualHW.productCompatibility" => "hosted",
+    "ide0:0.redo" => "",
+    "vmotion.checkpointFBSize" => "65536000",
+    "parallel0.startConnected" => "FALSE",
+    "serial0.startConnected" => "FALSE"
+  )
+  
+  def initialize(o={})
+    dsl_options({:vmx_file => default_dsl_options}.merge(o))
+  end
+  
+  def set(k,v)
+    options[:vmx_file]["#{k}"] = v
+  end
+  
+  def compile
+    ::File.open("#{base_directory}/#{name}/#{name}.vmx", "w") {|f| f << to_vmx }
+  end
+  def to_vmx
+    out = []
+    options[:vmx_file].each do |k,v|
+      out << "#{k}=\"#{v}\""
+    end
+    out.join("\n")
+  end
+end

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

@@ -0,0 +1,158 @@
+=begin rdoc
+  The Vmrun remote base uses the vmrun command to implement a cloud remoter base.
+  The Vmrun remoter base has been tested with Vmware fusion on the mac.
+  
+  In order to use the Vmrun remoter base you will need to setup a few things.
+  First, you will need to have the Vmware fusion installed and vmrun command in your path.
+  The default location of the vmrun binary is /Library/Application Support/VMware Fusion/vmrun.
+  You will then of course need a virtual machine installed and available.  
+  Once you have your instance installed and running, you need to setup your ssh keys so that poolparty can ssh into the instance. Get the ip of you instnace with ifconfig inside the running instance.
+  For example:
+    
+    ssh root@172.0.1.129 "mkdir /root/.ssh && chmod 600 /root/.ssh"
+    scp my_key.pub root@172.0.1.129:/root/.ssh/authorized_keys
+    
+  provide a using :vmrun block in your clouds.rb
+  for example:
+    
+    using :vmrun do
+      vmx_hash(::File.expand_path("~/Documents/Virtual\ Machines.localized/Ubuntu-jaunty.vmwarevm/Ubuntu-jaunty.vmx") => '172.16.68.129')
+    end
+   
+   The vmx file fulfills a similar purpose as the ami id in ec2. Note that expand path.  vmrun return fuill paths, so we must provide full paths so things match up later. W
+   Vmrun does not provide a meta server like ec2 has, so you need to list the ip address of your VM.  For this reason it is recommended that you use NAT addressing on your VM to maintain consistent addressing across different physical networks.
+  
+  Also, note that vmrun does not copy the VM to a new distinct VM on each run, so if you want to be able to start from a known state, you should make a snapshot before using your vm with poolparty.  Then, you can rollback to this initial state if you want to ensure you can repeat a fresh cloud-start.
+  
+=end
+
+module PoolParty
+  module Remote
+    class Vmrun < Remote::RemoterBase
+      include Dslify
+
+      default_options(
+        :path_to_binary => 'vmrun',
+        :images_repo_path => ::File.expand_path("~/Documents/Virtual_Machines.localized/"),
+        :default_cli_options => 'gui',
+        :terminate_options => 'soft',
+        :vmx_hash => 'need to specify vmx_files to use'
+      )
+      
+      def initialize(par, opts={}, &block)
+        dsl_options opts
+        instance_eval &block if block
+        super(par, &block)    
+      end
+
+      def self.launch_new_instance!(o={})
+        new_instance(o).launch_new_instance!
+      end
+      def launch_new_instance!(o={})
+        VmwareInstance.new( :vmx_file => next_unused_vmx_file, 
+                            :ip => vmx_hash[next_unused_vmx_file], 
+                            :keypair => cloud.keypair
+                          ).launch!
+      end
+      # Terminate an instance by id
+      def self.terminate_instance!(o={})
+        new(nil, o).terminate_instance!
+      end
+      def terminate_instance!(o={})
+        dsl_options o
+        VmwareInstance.new( :vmx_file => last_unused_vmx_file, 
+                            :ip => vmx_hash[last_unused_vmx_file], 
+                            :keypair => cloud.keypair
+                          ).terminate!(terminate_options)
+      end
+
+      # Describe an instance's status, must pass :vmx_file in the options
+      def self.describe_instance(o={})
+        # vmx_file = o[:vmx_file] || Vmrun.running_instances.first
+        new_instance(o).describe_instance
+      end
+      def describe_instance(o={})        
+        running_instances.select {|inst| inst.vmx_file == o[:vmx_file] }.first
+      end
+
+      def self.describe_instances(o={})
+        new_instance(o).describe_instances
+      end
+      def describe_instances(o={})
+        running_instances.map {|a| a.to_hash }
+      end
+
+      # After launch callback
+      # This is called after a new instance is launched
+      def after_launched(force=false)
+        puts "new vmware instance was launched"
+      end
+
+      # Before shutdown callback
+      # This is called before the cloud is contracted
+      def before_shutdown
+      end
+      def self.path_to_binary
+        new(parent).path_to_binary
+      end
+            
+      def after_launch_instance(inst=nil)
+        if inst
+          dputs "Associate address after launched: #{inst.ip}"
+        end
+      end
+      
+      private
+      def self.new_instance(o={})
+        Vmrun.new((cloud rescue o), o)
+      end
+      
+      def running_instances(o={})
+        output = run_local "#{path_to_binary} list"
+        lines = output.split("\n")
+        lines.shift
+        lines.map {|vmx_file| VmwareInstance.new( :vmx_file => vmx_file, 
+                                                  :ip => vmx_hash[vmx_file], 
+                                                  :keypair => cloud.keypair
+                                                ) }
+      end
+      
+      # vmrun specific methods
+      def self.run_local(cmd, o={:raise_on_error=>false, :verbose=>true})
+        output = `#{cmd}`
+        unless $?.success?
+          $stderr.puts "FAILED: #{cmd}\n code = #{$?}"
+          raise "ERROR: run_local" if o[:raise_on_error]
+        end
+        output
+      end
+      
+      def run_local(cmd, o={:raise_on_error=>false, :verbose=>true})
+        self.class.run_local(cmd, o)
+      end
+      
+      def next_unused_vmx_file
+        tmp = (vmx_files - running_instances.map {|a| a.vmx_file })
+        (tmp.empty? ? vmx_files : tmp).first
+      end
+      
+      def last_unused_vmx_file
+        running_instances.last.vmx_file
+      end
+      
+      def vmx_files
+        vmx_hash.keys
+      end
+      
+      def id(vfile)
+        vmx_file(vfile)
+      end
+      
+      ## method's to override default RemoteInstance
+      def instance_id
+        vmx_file
+      end
+      
+    end
+  end
+end

data/lib/poolparty/net/remoter_bases/vmrun/vmrun_instance.rb

@@ -0,0 +1,71 @@
+module PoolParty  
+  module Remote
+    
+    class VmwareInstance
+      attr_reader :ip, :mac_address, :vmx_file, :keypair, :cloud
+      
+      def initialize(o={}, cld=nil)
+        raise "You must pass a vmx_file" unless o[:vmx_file]
+        @vmx_file = ::File.expand_path(o[:vmx_file])
+        @ip = o[:ip]
+        @keypair = o[:keypair]
+        
+        @cloud = cld
+      end
+      
+      def to_hash
+        {
+          :status => status,
+          :mac_addresses => mac_address,
+          :ip => ip,
+          :instance_id => vmx_file,
+          :internal_ip => ip,
+          :keypair => keypair
+        }
+      end      
+      def status
+        "running"
+      end      
+      # Is this instance running?
+      def running?
+        true
+      end
+      # Is this instance pending?
+      def pending?
+        false
+      end
+      # Is this instance terminating?
+      def terminating?
+        false
+      end
+      # Has this instance been terminated?
+      def terminated?
+        false
+      end
+      def launch!
+        Vmrun.run_local("#{Vmrun.path_to_binary} start \"#{vmx_file}\"")
+        dputs "Launched new vmware instance from vmx: #{vmx_file}"
+        to_hash
+      end
+      def terminate!(o)
+        Vmrun.run_local("#{Vmrun.path_to_binary} stop \"#{vmx_file}\" #{o}")
+      end
+      # Get the ip from the arp -a
+      # def ip
+      #   @ip ||= %x[arp -a].select {|a| a if a =~ /#{mac_address.macify}/}.first[/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/]
+      # end
+      # Get the mac address in the vmx_file
+      def mac_address
+        @mac_address ||= parse_vmx_file[:"ethernet0.generatedAddress"]
+      end
+      def parse_vmx_file
+        vmx_data.to_hash
+      end
+      def vmx_data
+        @vmx_data ||= open(vmx_file).read
+      end
+      
+    end    
+    
+  end
+end

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

@@ -0,0 +1,340 @@
+module PoolParty
+  class Base
+
+=begin rdoc
+
+Install Apache2 and make various helpers accessible.
+
+NOTE: this will not install a virtual host by default, *including* a default
+host. This means apache will not start up unless you specify at least the
+default host. 
+
+=end
+
+    plugin :apache do
+      def loaded(opts={}, &block)        
+        has_service("apache2", :requires => get_package("apache2"))
+      end
+
+      def enable
+        enable_default
+      end
+
+      def before_load(o={}, &block)
+        install
+      end
+            
+      def install
+        installed_as_worker
+      end
+      
+      def installed_as_worker            
+        unless @installed_as_worker
+          has_package("apache2")
+          has_package("apache2-mpm-worker")
+
+          base_install
+          @installed_as_worker = true
+        end            
+      end
+
+      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})
+
+          configs
+          @base_install = true
+        end
+      end
+
+      # def install_passenger# {{{
+      #   base_install
+      #   enable_passenger
+      # end# }}}
+
+      # def enable_passenger# {{{
+      #   unless @enable_passenger
+      #     installed_as_worker
+      #     has_package(:name => "build-essential")
+      #     has_package(:name => "apache2-prefork-dev")
+      #     has_gempackage(:name => "fastthread")
+
+      #     has_exec(:name => "install_passenger_script", 
+      #       :command => "/usr/bin/ruby #{Base.remote_storage_path}/install_passenger.rb", 
+      #       :if_not => "test -f /etc/apache2/conf.d/passenger.conf && test -s /etc/apache2/conf.d/passenger.conf",
+      #       :calls => get_service("apache2")
+      #       )
+
+      #     has_file(:name => "#{Base.remote_storage_path}/install_passenger.rb", :calls => get_exec("install_passenger_script")) do
+      #       template File.dirname(__FILE__)/".."/"templates"/"apache2"/"install_passenger.rb"
+      #       template "install_passenger.rb" # todo
+      #     end
+
+      #     has_gempackage(:name => "passenger", :calls => get_exec("install_passenger_script"))
+          
+      #     @enable_passenger = true
+      #   end
+      # end
+      # }}}
+
+      # def enable_ssl# {{{
+      #   unless @enable_ssl
+      #     has_package("apache2.2-common")
+      #     has_package("openssl")
+      #     has_variable(:name => "ssl_enabled", :value => "true")
+
+      #     has_exec(:command => "a2enmod ssl") do
+      #       requires [ get_package("openssl") ]
+      #       if_not "/usr/bin/test -L /etc/apache2/mods-enabled/ssl.load"
+      #       calls get_exec("restart-apache2")
+      #     end
+      #     @enable_ssl = true
+      #   end
+      # end# }}}
+      
+      def configs
+        unless @configs
+          has_directory("/etc/apache2")
+          has_directory("/etc/apache2/conf.d")
+          has_directory("/etc/apache2/site-includes")
+
+          has_file(:name => "/etc/apache2/apache2.conf") do
+            mode 644
+            requires get_directory("/etc/apache2/conf.d")
+            template "apache2"/"apache2.conf"
+          end
+          does_not_have_file(:name => "/etc/apache2/ports.conf")
+
+          has_exec(:command => "/usr/sbin/a2dissite default") do
+            only_if "/usr/bin/test -L /etc/apache2/sites-enabled/000-default"
+            calls get_exec("reload-apache2")
+          end
+
+          # Base config
+          config("base", "apache2"/"base.conf.erb")
+          config("mime", "apache2"/"mime-minimal.conf.erb")
+          config("browser_fixes", "apache2"/"browser_fixes.conf.erb")
+
+          present_apache_module("mime", "rewrite")
+        # end
+          @configs = true
+        end
+      end
+
+      def enable_default
+        listen 80 # assumes no haproxy
+        site "default-site", :template => :apache2/"default-site.conf.erb"
+      end
+
+      
+      def config(name, temp)
+        has_file(:name => "/etc/apache2/conf.d/#{name}.conf") do
+          template temp
+          calls get_exec("reload-apache2")
+        end
+      end
+      
+      def listen(port="8080")
+        has_variable(:name => "port", :value => port)
+      end
+      
+      def site(name, opts={})
+        case opts[:ensure] || "present"
+        when "present", "installed"
+          install_site(name, opts)
+        when "absent"
+          has_exec(:command => "/usr/sbin/a2dissite #{name}", :calls => get_exec("reload-apache2")) do
+          requires get_package("apache2")
+            only_if "/bin/sh -c \"[ -L /etc/apache2/sites-enabled/#{name} ] && [ /etc/apache2/sites-enabled/#{name} -ef /etc/apache2/sites-available/#{name}]\""
+          end
+        end
+      end
+      
+      def install_site(name, opts={})
+        opts.merge!(:name => "/etc/apache2/sites-available/#{name}")
+        has_directory(:name => "/etc/apache2/sites-available")
+        has_file(opts)
+        has_exec(:name => "/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/#{name} ] && [ /etc/apache2/sites-enabled/#{name} -ef /etc/apache2/sites-available/#{name} ]'"
+        end
+      end
+      
+      def site_include(name, content, ensureer="present")
+        has_file(:name => "/etc/apache2/site-includes/#{name}.inc", :ensures => ensureer, :content => content, :requires => get_file("/etc/apache2/site-includes"))
+      end
+      
+      def present_apache_module(*names)
+        names.each do |name|
+          has_exec(:name => "mod-#{name}", :command => "/usr/sbin/a2enmod #{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")            
+          end
+        end
+      end
+      
+      def absent_apache_module(*names)
+        names.each do |name|
+          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")
+          end
+        end
+      end
+      
+    end
+
+  virtual_resource(:virtualhost) do
+    def listen(port="8080")
+      has_variable(:name => "port", :value => port)
+      port port
+    end
+        
+    def virtual_host_entry(file)
+      @virtual_host_entry = true
+      if ::File.file?(file)
+        has_file(options.merge({:name => "/etc/apache2/sites-available/#{name}", 
+                                :template => file, 
+                                :requires => get_package("apache2")}))
+      else
+        has_file(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")
+      has_directory(:name => "/var/www/#{name}")
+      has_directory(:name => "/var/www/#{name}/logs", :owner => "www-data")
+
+      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    # {{{
+#     def loaded(opts={}, parent=self)
+#       enable_passenger
+#       passenger_entry <<-EOE
+# Listen #{port ? port : "8080"}
+# <VirtualHost *>
+#     ServerName #{name}
+#     DocumentRoot #{docroot || "/var/www/#{name}"}/public
+#     RailsEnv production
+#     ErrorLog #{docroot || "/var/www/#{name}"}/log/error_log
+#     CustomLog #{docroot || "/var/www/#{name}"}/log/access_log common
+# </VirtualHost>
+#       EOE
+      
+#       has_directory(:name => "/var/www")
+#       has_directory(:name => "/var/www/#{name}")
+#       has_directory(:name => "/var/www/#{name}/log", :requires => get_directory("/var/www/#{name}/"))
+      
+#       has_variable(:name => "sitename", :value => "#{name}")      
+      
+#       has_exec(:command => "/usr/sbin/a2ensite #{name}", :calls => 'Exec["reload-apache2"]', :requires => get_file("/etc/apache2/sites-available/#{name}")) do
+#         if_not "/bin/sh -c \"[ -L /etc/apache2/sites-enabled/#{name} ] && [ /etc/apache2/sites-enabled/#{name} -ef /etc/apache2/sites-available/#{name} ]\""
+#       end
+#     end
+#     def passenger_entry(file)
+#       if ::File.file?(file)
+#         has_file({:name => "/etc/apache2/sites-available/#{name}", :ensures => 'present', :alias => "#{name}", :template => file, :requires => get_package("apache2")})
+#       else
+#         has_file({:content => file, :name => "/etc/apache2/sites-available/#{name}", :ensures => 'present', :alias => "#{name}", :content => file, :requires => get_package("apache2")})
+#       end
+#     end
+#   end
+  
+#   virtual_resource(:passengersite_with_ssl) do
+#     def loaded(opts={}, parent=self)
+#       enable_passenger
+
+#       has_variable(:name => "virtualhost_name", :value => name)
+#       has_variable(:name => "port", :value => port.nil? ? "8080" : port)
+            
+#       has_directory(:name => "/var/www")
+#       has_directory(:name => "/var/www/#{name}")
+#       has_directory(:name => "/var/www/#{name}/log", :requires => get_directory("/var/www/#{name}/"))
+      
+#       has_variable(:name => "passenger_name", :value => name)
+      
+#       has_file(options.merge({:name => "/etc/apache2/sites-available/#{name}", :ensures => 'present', :alias => "#{name}", :requires => get_package("apache2")})) do
+#         template File.dirname(__FILE__), "/../templates/webserver", "passenger.conf.erb"
+#       end
+      
+#       has_exec(:command => "/usr/sbin/a2ensite #{name}", :calls => 'Exec["reload-apache2"]', :requires => get_file("/etc/apache2/sites-available/#{name}")) do
+#         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
+    
+#     tell apache ssl which certificate/private key files to use for this virtual site
+#     def certificate(cert_path, key_path)
+#       cert_name = File.basename(cert_path)
+#       key_name = File.basename(key_path)
+#       has_variable(:name => "ssl_cert_file", :value => "/var/www/#{name}/cert/#{cert_name}")
+#       has_variable(:name => "ssl_private_key_file", :value => "/var/www/#{name}/cert/#{key_name}")
+    
+#       has_directory(:name => "/var/www")
+#       has_directory(:name => "/var/www/#{name}")
+#       has_directory(:name => "/var/www/#{name}/cert", :requires => get_directory("/var/www/#{name}/"))
+    
+#       has_file(:name => "/var/www/#{name}/cert/#{cert_name}") do
+#         content open(cert_path).read
+#       end
+#       has_file(:name => "/var/www/#{name}/cert/#{key_name}") do
+#         content open(key_path).read
+#       end
+#     end    
+#   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")})
+      end
+
+      def extras(*names)
+        names.each do |name|
+         has_package(:name => "php5-#{name}", :requires => get_package("php5"))
+        end
+      end
+
+    end
+
+  end
+
+end