poolparty 1.3.4 → 1.3.6

data/lib/poolparty/installers/ec2.rb

@@ -4,7 +4,8 @@ module PoolParty
       
       def steps
         [
-          :todo
+          :find_ec2_directory, :ask_for_access_key, :ask_for_private_access_key,
+          :show_env_setup
         ]
       end
       
@@ -16,15 +17,84 @@ module PoolParty
         "Ec2 installer"
       end
       
-      def todo
+      def find_ec2_directory
+        msg = "We found the following vmware files in the default vmware directory.\nChoose one of these to use as your vmrun file or select other\n<line>"
+        
+        directories = {}
+        default_ec2_directories.each_with_index do |file,idx|
+          directories.merge!(idx+1 => file)
+        end
+        
+        base = choose(msg, directories)
+        @ec2_directory = base == :other ? ask_for_ec2_directory : base
+      end
+      
+      def ask_for_access_key
+        access_key_help =<<-EOV
+EC2 uses an access key to identify you and allows you to start and stop instances.
+        EOV
+
+        access_key = <<-EOE
+What is your access key?
+        EOE
+        ask_with_help :message => access_key, :help => access_key_help do |k|
+          @access_key = k
+        end
+      end
+      
+      def ask_for_private_access_key
+        private_access_key_help =<<-EOV
+EC2 uses a private access key to identify you and allows you to start and stop instances.
+        EOV
+
+        private_access_key = <<-EOE
+What is your private access key?
+        EOE
+        ask_with_help :message => private_access_key, :help => private_access_key_help do |k|
+          @secret_access_key = k
+        end
+      end
+      
+      
+      def ask_for_ec2_directory
+        ec2_directory_help =<<-EOV
+Ec2 needs to know where you store your certificates and private keys. Amazon expects these to be in the ~/.ec2 directory. We suggest a subdirectory of the ~/.ec2 directory so you can separate ec2 accounts. 
+        EOV
+
+        ec2_directory_msg = <<-EOE
+What's path to your ec2 directory with your cert and pk files?
+        EOE
+        ask_with_help :message => ec2_directory_msg, :help => ec2_directory_help
+      end
+
+      
+      def show_env_setup
         colored_say <<-EOE
-          <line>
-          <red>Not implemented yet</red>
-          <line>
+<line>
+  
+  Setup your environment:
+  
+  export EC2_ACCESS_KEY=#{@access_key}
+  export EC2_SECRET_KEY=#{@secret_access_key}
+
+  export EC2_PRIVATE_KEY=$(ls #{@ec2_directory}/pk-*.pem)
+  export EC2_CERT=$(ls #{@ec2_directory}/cert-*.pem)
+  
+<line>
         EOE
         exit 0
       end
       
+      private
+      
+      def default_ec2_directories
+        @default_ec2_directories ||= find_default_ec2_directories rescue nil
+      end
+      
+      def find_default_ec2_directories
+        Dir["#{::File.expand_path("~")}/.ec2/*"].reject {|f| File.file?(f) }
+      end
+      
     end
   end
 end

data/lib/poolparty/installers/vmware.rb

@@ -59,9 +59,14 @@ Awesome. What's the path to your vmwarevm file?
         ip_help =<<-EOV
 Right now, vmrun, the remoter base needs an explicitly set ip. Log into your vm and type ifconfig. Copy and paste that here.
         EOV
-        @ip = ask_with_help :message => "Now, what's the ip of your vm?", :help => ip_help
+        @ip = ask_with_help :message => "what's the ip of your vm?", :help => ip_help
         
-        puts @ip
+        if @ip =~ /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/
+          @ip
+        else
+          colored_say "<red>You must enter a valid ip</red>"
+          get_vm_ip
+        end
       end
       
       def get_key
@@ -70,9 +75,16 @@ Finally, we'll set somethings up here shortly, but first we'll need to know wher
 at ~/.ssh/id_rsa.pub. If this is true, then just press enter. Otherwise, enter the path of your public key.        
         EOV
         
-        ask_with_help :message => "What keypair would you like to use? (default: ~/.ssh/id_rsa.pub)",
-                      :help => key_help do |k|
-          @key = k.empty? ? ::File.expand_path("~/.ssh/id_rsa.pub") : k
+        ask_with_help :message => "What keypair would you like to use? (default: ~/.ssh/id_rsa.pub)", :help => key_help do |responded_key|
+          responded_key = "~/.ssh/id_rsa.pub" if responded_key.empty?
+
+          @key = File.expand_path(responded_key)
+          if File.file?(@key)
+            @key
+          else
+            colored_say "<red>You must enter a valid path to a keyfile</red>"
+            get_key
+          end
         end
       end
       

data/lib/poolparty/plugin.rb

@@ -2,11 +2,7 @@
   Simply a stub class for documentation purposes
   Plugins are all resources
 =end
-module PoolParty
-  class Plugin
-  end
-end
 
-%w(apache git rails).each do |plugin|
+%w(apache git rails collectd hermes).each do |plugin|
   require "plugins/#{plugin}"
 end

data/lib/poolparty/plugins/apache.rb

@@ -1,4 +1,5 @@
 module PoolParty
+  
   module Resources
     
     class Apache < Resource
@@ -49,12 +50,12 @@ module PoolParty
           passenger_configs
           
           has_exec "install_passenger_script" do
-            command 'echo -en \"\\\\n\\\\n\\\\n\\\\n\" | passenger-install-apache2-module'
+            command "passenger-install-apache2-module --auto"
             notifies get_exec("restart-apache2"), :run
             requires get_exec("restart-apache2")
             requires get_package("apache2")
             requires get_gem_package("passenger")
-            not_if "test -f /etc/apache2/mods-available/passenger.conf && test -s /etc/apache2/mods-available/passenger.conf"
+            not_if "test -f /etc/apache2/mods-available/passenger.conf && test -s /etc/apache2/mods-available/passenger.conf "
             creates lambda { "@node[:apache][:passenger_module_path]" }
             end
           
@@ -156,14 +157,16 @@ PassengerRuby <%= @node[:languages][:ruby][:ruby_bin] %>
       end
       
       def install_site(name, opts={})
-        opts.merge!(:name => "/etc/apache2/sites-available/#{name}")
+        sitename = name
+
+        opts.merge!(:name => "/etc/apache2/sites-available/#{sitename}")
         has_directory(:name => "/etc/apache2/sites-available")
         has_file(opts) unless opts[:no_file]
-        has_exec(:name => "/usr/sbin/a2ensite #{name}") do
+        has_exec(:name => "/usr/sbin/a2ensite #{sitename}") do
           notifies get_exec("reload-apache2"), :run
           requires get_exec("reload-apache2")
-          requires get_file("/etc/apache2/sites-available/#{name}")
-          not_if "/bin/sh -c '[ -L /etc/apache2/sites-enabled/#{name} ] && [ /etc/apache2/sites-enabled/#{name} -ef /etc/apache2/sites-available/#{name} ]'"
+          requires get_file("/etc/apache2/sites-available/#{sitename}")
+          not_if "/bin/sh -c '[ -L /etc/apache2/sites-enabled/#{sitename} ] && [ /etc/apache2/sites-enabled/#{sitename} -ef /etc/apache2/sites-available/#{sitename} ]'"
         end
       end
       
@@ -201,4 +204,4 @@ end
 $:.unshift(File.dirname(__FILE__))
 %w(php5 virtual_host passenger_site).each do |lib|
   require "apache2/#{lib}"
-end
+end

data/lib/poolparty/plugins/apache2/base.conf.erb

@@ -162,10 +162,10 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 
-DocumentRoot /var/www
+#DocumentRoot /var/www
 
 # Listen <%= @node[:apache][:port] %>
-NameVirtualHost *:<%= @node[:apache][:port] %>
+#NameVirtualHost *:<%= @node[:apache][:port] %>
 
 
 # NEW CONFIG FILE

data/lib/poolparty/plugins/apache2/browser_fixes.conf.erb

@@ -23,4 +23,4 @@
     BrowserMatch "^gnome-vfs/1.0" redirect-carefully
     BrowserMatch "^XML Spy" redirect-carefully
     BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
-</IfModule>
+</IfModule>

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

@@ -32,9 +32,9 @@ module PoolParty
           if !File.exists?("#{dir}/#{name}/current")
           
           # setup an initial symlink so apache will start even if there have not been any deploys yet
-            has_site_directory "releases/initial/public"
+            #has_site_directory "releases/initial/public"
             #FIXME  the following line is chef specific.  It will fail with puppet
-            # has_symlink(:target_file => "#{dir}/#{name}/current", :to => "#{dir}/#{name}/releases/initial")
+            has_link(:target_file => "#{dir}/#{name}/current", :to => "#{dir}/#{name}/releases/initial")
           end
           log_dir = "#{site_directory}/shared/log"
           appended_path "current"

data/lib/poolparty/plugins/collectd/templates/collectd.conf.erb

@@ -0,0 +1,369 @@
+# Config file for collectd(1).
+#
+# Some plugins need additional configuration and are disabled by default.
+# Please read collectd.conf(5) for details.
+#
+# You should also read /usr/share/doc/collectd/README.Debian.plugins before
+# enabling any more plugins.
+
+#Hostname "localhost"
+FQDNLookup true
+#BaseDir "/var/lib/collectd"
+#PluginDir "/usr/lib/collectd"
+#TypesDB "/usr/lib/collectd/types.db" "/etc/collectd/my_types.db"
+#Interval 10
+#ReadThreads 5
+
+#LoadPlugin logfile
+LoadPlugin syslog
+
+#<Plugin logfile>
+#       LogLevel "info"
+#       File STDOUT
+#       Timestamp true
+#</Plugin>
+
+<Plugin syslog>
+        LogLevel info
+</Plugin>
+
+#LoadPlugin apache
+#LoadPlugin apcups
+#LoadPlugin ascent
+#LoadPlugin battery
+LoadPlugin cpu
+#LoadPlugin cpufreq
+LoadPlugin csv
+# LoadPlugin df
+LoadPlugin disk
+#LoadPlugin dns
+#LoadPlugin email
+#LoadPlugin entropy
+#LoadPlugin exec
+#LoadPlugin hddtemp
+LoadPlugin interface
+#LoadPlugin ipmi
+LoadPlugin iptables
+#LoadPlugin ipvs
+#LoadPlugin irq
+LoadPlugin libvirt
+LoadPlugin load
+#LoadPlugin mbmon
+#LoadPlugin memcached
+LoadPlugin memory
+#LoadPlugin multimeter
+#LoadPlugin mysql
+#LoadPlugin netlink
+LoadPlugin network
+# LoadPlugin nfs
+#LoadPlugin nginx
+#LoadPlugin ntpd
+#LoadPlugin nut
+#LoadPlugin perl
+#LoadPlugin ping
+#LoadPlugin powerdns
+# LoadPlugin processes
+LoadPlugin rrdtool
+#LoadPlugin sensors
+#LoadPlugin serial
+#LoadPlugin snmp
+# LoadPlugin swap
+#LoadPlugin tail
+LoadPlugin tcpconns
+#LoadPlugin teamspeak2
+#LoadPlugin unixsock
+LoadPlugin users
+LoadPlugin uuid
+#LoadPlugin vmem
+#LoadPlugin vserver
+#LoadPlugin wireless
+
+#<Plugin apache>
+#       URL "http://localhost/status?auto"
+#       User "www-user"
+#       Password "secret"
+#       VerifyPeer false
+#       VerifyHost false
+#       CACert "/etc/ssl/ca.crt"
+#</Plugin>
+
+#<Plugin apcups>
+#       Host "localhost"
+#       Port "3551"
+#</Plugin>
+
+#<Plugin ascent>
+#       URL "http://localhost/ascent/status/"
+#       User "www-user"
+#       Password "secret"
+#       CACert "/etc/ssl/ca.crt"
+#</Plugin>
+
+#<Plugin csv>
+#       DataDir "/var/lib/collectd/csv"
+#       StoreRates false
+#</Plugin>
+
+#<Plugin df>
+#       Device "/dev/sda1"
+#       Device "192.168.0.2:/mnt/nfs"
+#        MountPoint "/home/eucalyptus"
+#       FSType "ext3"
+#       IgnoreSelected false
+# </Plugin>
+
+#<Plugin disk>
+#       Disk "hda"
+#       Disk "/sda[23]/"
+#       IgnoreSelected false
+#</Plugin>
+
+#<Plugin dns>
+#       Interface "eth0"
+#       IgnoreSource "192.168.0.1"
+#</Plugin>
+
+#<Plugin email>
+#       SocketGroup "collectd"
+#       SocketPerms "0770"
+#       MaxConns 5
+#</Plugin>
+
+#<Plugin exec>
+#       Exec user "/path/to/exec"
+#       Exec "user:group" "/path/to/exec"
+#       NotificationExec user "/path/to/exec"
+#</Plugin>
+
+#<Plugin hddtemp>
+#       Host "127.0.0.1"
+#       Port 7634
+#       TranslateDevicename false
+#</Plugin>
+
+#<Plugin interface>
+#       Interface "eth0"
+#       IgnoreSelected false
+#</Plugin>
+
+#<Plugin iptables>
+#       Chain "table" "chain"
+#</Plugin>
+
+#<Plugin irq>
+#       Irq 7
+#       Irq 8
+#       Irq 9
+#       IgnoreSelected true
+#</Plugin>
+
+<Plugin libvirt>
+        Connection "qemu:///system"
+#       Connection "xen:///"
+        RefreshInterval 10
+#       Domain "name"
+#       BlockDevice "name:device"
+#       InterfaceDevice "name:device"
+#       IgnoreSelected false
+        HostnameFormat hostname name
+</Plugin>
+
+#<Plugin mbmon>
+#       Host "127.0.0.1"
+#       Port 411
+#</Plugin>
+
+#<Plugin memcached>
+#       Host "127.0.0.1"
+#       Port "11211"
+#</Plugin>
+
+#<Plugin mysql>
+#       Host "database.serv.er"
+#       User "db_user"
+#       Password "secret"
+#       Database "db_name"
+#</Plugin>
+
+#<Plugin netlink>
+#       Interface "All"
+#       VerboseInterface "All"
+#       QDisc "eth0" "pfifo_fast-1:0"
+#       Class "ppp0" "htb-1:10"
+#       Filter "ppp0" "u32-1:0"
+#       IgnoreSelected false
+#</Plugin>
+
+<Plugin network>
+        <%= "Server #{@node[:collectd][:server]}" %>
+        Listen "<%= @node.ipaddress %>"
+#       Server "ff18::efc0:4a42" "25826"
+#       Server "239.192.74.66" "25826"
+#       Listen "ff18::efc0:4a42" "25826"
+#       Listen "239.192.74.66" "25826"
+#       TimeToLive "128"
+#       Forward false
+#       CacheFlush 1800
+</Plugin>
+
+#<Plugin nginx>
+#       URL "http://localhost/status?auto"
+#       User "www-user"
+#       Password "secret"
+#       VerifyPeer false
+#       VerifyHost false
+#       CACert "/etc/ssl/ca.crt"
+#</Plugin>
+
+#<Plugin ntpd>
+#       Host "localhost"
+#       Port 123
+#       ReverseLookups false
+#</Plugin>
+
+#<Plugin nut>
+#       UPS "upsname@hostname:port"
+#</Plugin>
+
+#<Plugin perl>
+#       IncludeDir "/my/include/path"
+#       BaseName "Collectd::Plugin"
+#       EnableDebugger ""
+#       LoadPlugin "foo"
+#       LoadPlugin "bar"
+#</Plugin>
+
+#<Plugin ping>
+#       Host "host.foo.bar"
+#       Host "host.baz.qux"
+#       TTL 255
+#</Plugin>
+
+#<Plugin powerdns>
+#       <Server "server_name">
+#               Collect "latency"
+#               Collect "udp-answers" "udp-queries"
+#               Socket "/var/run/pdns.controlsocket"
+#       </Server>
+#       <Recursor "recursor_name">
+#               Collect "questions"
+#               Collect "cache-hits" "cache-misses"
+#               Socket "/var/run/pdns_recursor.controlsocket"
+#       </Recursor>
+#       LocalSocket "/opt/collectd/var/run/collectd-powerdns"
+#</Plugin>
+
+#<Plugin processes>
+#       Process "name"
+#</Plugin>
+
+<Plugin rrdtool>
+        DataDir "/var/lib/collectd/rrd"
+#       CacheTimeout 120
+#       CacheFlush 900
+#
+# The following settings are rather advanced
+# and should usually not be touched:
+#       StepSize 10
+#       HeartBeat 20
+#       RRARows 1200
+#       RRATimespan 158112000
+#       XFF 0.1
+</Plugin>
+
+#<Plugin sensors>
+#       Sensor "it8712-isa-0290/temperature-temp1"
+#       Sensor "it8712-isa-0290/fanspeed-fan3"
+#       Sensor "it8712-isa-0290/voltage-in8"
+#       IgnoreSelected false
+#</Plugin>
+
+# See /usr/share/doc/collectd/examples/snmp-data.conf.gz for a
+# comprehensive sample configuration.
+#<Plugin snmp>
+#       <Data "powerplus_voltge_input">
+#               Type "voltage"
+#               Table false
+#               Instance "input_line1"
+#               Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1"
+#       </Data>
+#       <Data "hr_users">
+#               Type "users"
+#               Table false
+#               Instance ""
+#               Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0"
+#       </Data>
+#       <Data "std_traffic">
+#               Type "if_octets"
+#               Table true
+#               Instance "IF-MIB::ifDescr"
+#               Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
+#       </Data>
+#
+#       <Host "some.switch.mydomain.org">
+#               Address "192.168.0.2"
+#               Version 1
+#               Community "community_string"
+#               Collect "std_traffic"
+#               Inverval 120
+#       </Host>
+#       <Host "some.server.mydomain.org">
+#               Address "192.168.0.42"
+#               Version 2
+#               Community "another_string"
+#               Collect "std_traffic" "hr_users"
+#       </Host>
+#       <Host "some.ups.mydomain.org">
+#               Address "192.168.0.3"
+#               Version 1
+#               Community "more_communities"
+#               Collect "powerplus_voltge_input"
+#               Interval 300
+#       </Host>
+#</Plugin>
+
+#<Plugin "tail">
+#       <File "/var/log/exim4/mainlog">
+#               Instance "exim"
+#               <Match>
+#                       Regex "S=([1-9][0-9]*)"
+#                       DSType "CounterAdd"
+#                       Type "ipt_bytes"
+#                       Instance "total"
+#               </Match>
+#               <Match>
+#                       Regex "\\<R=local_user\\>"
+#                       DSType "CounterInc"
+#                       Type "counter"
+#                       Instance "local_user"
+#               </Match>
+#       </File>
+#</Plugin>
+
+#<Plugin tcpconns>
+#       ListeningPorts false
+#       LocalPort "25"
+#       RemotePort "25"
+#</Plugin>
+
+#<Plugin teamspeak2>
+#       Host "127.0.0.1"
+#       Port "51234"
+#       Server "8767"
+#</Plugin>
+
+#<Plugin unixsock>
+#       SocketFile "/var/run/collectd-unixsock"
+#       SocketGroup "collectd"
+#       SocketPerms "0660"
+#</Plugin>
+
+#<Plugin uuid>
+#       UUIDFile "/etc/uuid"
+#</Plugin>
+
+#<Plugin vmem>
+#       Verbose false
+#</Plugin>
+
+Include "/etc/collectd/thresholds.conf"

data/lib/poolparty/plugins/collectd.rb

@@ -0,0 +1,24 @@
+module PoolParty
+  module Resources
+  
+    class Collectd < Resource
+      
+      PoolParty::Resources::FileResource.has_searchable_paths(:prepend_paths=> [File.dirname(__FILE__)+'/collectd/templates'])
+      
+      def after_loaded
+        has_package 'collectd'
+        %w(rrdtool librrd-dev librrd-ruby  libsensors-dev libsnmp-dev collectd collectd-dev).each{|pkg| 
+          has_package pkg 
+        }
+        has_gem_package "astro-collectd"
+        
+        has_variable 'server', "localhost"
+        has_file '/etc/collectd/collectd.conf' do
+          template 'collectd.conf.erb'
+        end
+      end
+      
+    end
+  
+  end
+end