cluster 0.7.6 → 0.7.8

data/instance_setup.sh

@@ -2,6 +2,7 @@
 # codename=$(lsb_release -cs)
 
 sed -i "/^# deb.*multiverse/ s/^# //" /etc/apt/sources.list
+
 gpg --keyserver keyserver.ubuntu.com --recv-key 40976EAF437D05B5
 gpg --keyserver keyserver.ubuntu.com --recv-key 3B4FE6ACC0B21F32
 gpg -a --export 40976EAF437D05B5 | sudo apt-key add -
@@ -114,6 +115,8 @@ gem 'passenger'
 gem 'cluster'
 gem 'interactive_editor'
 gem 'bundler'
+gem 'god'
+gem 'madmimi'
 EOF
 bundle install --system --gemfile=/etc/bundler/Gemfile --binstubs=/usr/local/bin
 

data/lib/cluster/infrastructures/amazon.rb

@@ -25,7 +25,7 @@ class Amazon < Infrastructure
     @options.owner ||= ENV['AMAZON_OWNER_ID'] 
     @options.cluster_bucket ||= ENV['CLUSTER_BUCKET']
     @options.bucket_key ||= 'cluster_credentials.yml'
-    @options.zones ||= if ENV['AMAZON_ZONE'].empty?
+    @options.zones ||= if !ENV['AMAZON_ZONE'] or ENV['AMAZON_ZONE'].empty?
                          nil
                        else
                          Array(ENV['AMAZON_ZONE'])
@@ -575,12 +575,14 @@ class Amazon < Infrastructure
     end
   end
 
-
   class << self
     def to_sdb_attributes(args)
       attrs = {}
       # FIXME this needs a way to deal with arrays that are empty
       args.each do |k, v|
+        # FIXME we probably should have some extra indicator of a 
+        # time field so that we can unmarshal it in the #from_sdb_results
+        v = v.utc.httpdate if Time === v
         v and attrs.merge!(k => Array(v))
       end
       attrs
@@ -600,7 +602,7 @@ class Amazon < Infrastructure
             n.merge attr => val
           end
         }
-        
+
         m << args
       }
     end

data/lib/cluster/version.rb

@@ -5,7 +5,7 @@ class Cluster
 
   class << self
     def version
-      '0.7.6'
+      '0.7.8'
     end
   end
 end

data/user_data_web.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
+apt-get -y install --reinstall debian-keyring debian-archive-keyring
+gpg --keyserver hkp://keyserver.ubuntu.com:80/ --recv-key 40976EAF437D05B5
+gpg --keyserver hkp://keyserver.ubuntu.com:80/ --recv-key 3B4FE6ACC0B21F32
+gpg -a --export 40976EAF437D05B5 | apt-key add -
+gpg -a --export 3B4FE6ACC0B21F32 | apt-key add -
+
 FRIENDLY=noble
 SERVICES=web
 PASSPHRASE='nope'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools