auser-poolparty 1.2.0 → 1.2.1

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

data/lib/poolparty/plugins/rails_deploy.rb

@@ -0,0 +1,76 @@
+=begin rdoc
+  Deploy a rails application using chef_deploy
+  
+  Usage:
+      has_rails_deploy "app_name" do
+        dir "/var/www"
+        repo "git://github.com/auser/paparazzi.git"
+        user "www-data"
+        database_yml /path/to/database.yml # or a string
+      end
+    
+    Sets up the filesystem structure (similar to capistrano deploy) and uses ezra's
+    chef-deploy to deploy the application
+=end
+module PoolParty
+  class Rails
+    
+    plugin :rails_deploy do
+      
+      default_options(
+        :dir => "/var/www",
+        :owner => "www-data"
+      )
+      
+      def loaded(o={}, &block)
+        raise "You must include the directory to deploy the rails app" unless dir?
+        raise "You must include the repo to deploy the rails app" unless repo?
+        
+        has_package "git-core"
+        has_directory dir
+        has_directory release_directory
+        has_directory "#{shared_directory}", :owner => owner
+        
+        %w(config pids log).each do |d|
+          has_directory "#{shared_directory}/#{d}", :owner => owner
+        end
+        
+        has_file "#{shared_directory}/config/database.yml", :owner => owner do
+          content ::File.file?(database_yml) ? open(database_yml).read : database_yml
+        end
+        
+        # Should these be here?
+        has_chef_recipe "apache2"
+        has_chef_recipe "apache2::mod_rails"
+          
+        dopts = options.choose {|k,v| [:repo, :user].include?(k)}
+        has_chef_deploy dopts.merge(:name => "#{release_directory}")
+        
+        if shared?
+          shared.each do |sh|
+            
+            has_directory "#{shared_directory}/#{::File.dirname(sh)}", :owner => owner
+            
+            has_exec "Create rails-deploy-#{name}-#{sh}", 
+              :command => "cp #{current_directory}/#{sh} #{shared_directory}/#{sh} && chown -R #{owner} #{shared_directory}/#{sh}",
+              :if_not => "test -f #{shared_directory}/#{sh}"
+              
+            has_symlink :name => "#{current_directory}/#{sh}", :to => "#{shared_directory}/#{sh}"
+          end
+        end
+        
+      end
+      private
+      def current_directory
+        "#{release_directory}/current"
+      end
+      def shared_directory
+        "#{release_directory}/shared"
+      end
+      def release_directory
+        "#{dir}/#{name}"
+      end
+      
+    end
+  end
+end

data/lib/poolparty/poolparty/default.rb

@@ -29,6 +29,7 @@ module PoolParty
       :default_specfile_name => "clouds.rb",
       :properties_hash_filename => "clouds.json",
       :vendor_path => "#{::File.dirname(__FILE__)}/../../../vendor",
+      :poolparty_src_path => "#{::File.dirname(__FILE__)}/../../..",
       :port => "80",
       :forwarding_port => "8080",
       :monitor_port => 8081,

data/lib/poolparty/poolparty/plugin.rb

@@ -11,7 +11,10 @@ module PoolParty
       
       def initialize(opts={}, prnt=nil, &block)
         setup_callbacks
-        before_load(opts, &block)
+
+        run_in_context do
+          before_load(opts, &block)
+        end
         
         block = Proc.new {enable} unless block
         

data/lib/poolparty/poolparty/poolparty_base_class.rb

@@ -54,13 +54,11 @@ module PoolParty
       subclass = "#{serv.class.to_s.top_level_class.underscore.downcase}#{extra_name}"
       lowercase_class_name = subclass.to_s.underscore.downcase || subclass.downcase
       
-      (services[lowercase_class_name.to_sym] ||= []) << serv if serv && !serv.empty?
+      # (services[lowercase_class_name.to_sym] ||= []) << serv if serv && !serv.empty?
+      ordered_resources << serv
       # services.merge!({lowercase_class_name.to_sym => serv})
     end
     # Container for the services
-    def services
-      @services ||= OrderedHash.new
-    end
     
     def resources
       @resources ||= OrderedHash.new

data/lib/poolparty/poolparty/resource.rb

@@ -8,6 +8,7 @@
 =end
 module PoolParty
   module Resources
+
     
     def custom_file(path, str)
       write_to_file_in_storage_directory(path, str)
@@ -26,6 +27,9 @@ module PoolParty
       # DSL Overriders
       include PoolParty::ResourcingDsl
       
+      # ability to have searchable paths on resources
+      include SearchablePaths
+
       # When we subclass Resource, we want to add a few methods to the Resources class
       # This will anable us to call out to these resources in our DSLified manner
       # When we call a method from the subclass, say it's the File class

data/lib/poolparty/poolparty/service.rb

@@ -2,10 +2,18 @@ module PoolParty
   
   class Service < PoolPartyBaseClass
     
+    include PoolParty::DependencyResolverCloudExtensions
+    
     def initialize(o={}, &block)
       super(o, &block)
     end
     
+    def to_properties_hash
+      { :pp_type => "plugin", :options => options, 
+        :name => self.class.to_s.top_level_class,
+        :resources => ordered_resources.map {|a| a.to_properties_hash }}
+    end
+    
     def cloud
       2.upto(context_stack.size) do |i|
         return ::PoolParty.context_stack[-i] if ::PoolParty.context_stack[-i].is_a?(PoolParty::Cloud::Cloud)

data/lib/poolparty/resources/file.rb

@@ -30,6 +30,7 @@ To write a file to the template directory, use:
   has_file(:name => '/etc/motd', :content => 'Hey and welcome to your node today!')
 =end
     class File < Resource
+      has_searchable_paths(:dir => "templates")
       
       def loaded(o={}, &block)
         parent.has_directory ::File.dirname(name) if parent
@@ -47,8 +48,7 @@ To write a file to the template directory, use:
         run_render = dsl_options.include?(:render_as) ? dsl_options.delete(:render_as) : false
         
         if dsl_options.include?(:template)          
-          filename = ::File.expand_path(dsl_options.template)
-          dsl_options.delete(:template)
+          filename = find_file(dsl_options.delete(:template))
           file = ::File.basename( filename )
           raise TemplateNotFound.new("no template given") unless file
 
@@ -66,7 +66,7 @@ To write a file to the template directory, use:
       def method_missing m, *a, &block
         super rescue ::File.send(m, *a, &block)
       end
-      
+
     end
     
   end

data/lib/poolparty/templates/apache2/apache2.conf

@@ -0,0 +1,14 @@
+# apache2.conf -- version for puppet-controlled installations
+#
+# this config file merely includes other files; all the truly important stuff
+# is configured in one of these directories.  
+
+# Include module configuration:
+Include /etc/apache2/mods-enabled/*.load
+Include /etc/apache2/mods-enabled/*.conf
+
+# Include generic snippets of statements
+Include /etc/apache2/conf.d/*.conf
+
+# Include the virtual host configurations:
+Include /etc/apache2/sites-enabled/