cluster 0.7.2 → 0.7.4

data/instance_setup.sh

@@ -137,13 +137,13 @@ export AWS_ELB_HOME=/usr/local/lib/elb
 export PATH=\${PATH}:\${AWS_ELB_HOME}/bin
 EOF
 
-# sed -i 's#^ruby #ruby3.8 #' /usr/bin/ec2-bundle-vol 
-# sed -i 's#^ruby #ruby1.8 #' /usr/bin/ec2-bundle-image 
-# sed -i 's#^ruby #ruby1.8 #' /usr/bin/ec2-unbundle
-
 # CouchDB was starting in 2, 3, 4, 5 and killed in 0, 6, 1
 for s in apache2 memcached couchdb nginx; do sudo update-rc.d -f $s remove; done
 
+### MYSQL
+sed -i '/^datadir.*=/ s@=.*@= /mnt/databases/mysql@' /etc/mysql/my.cnf
+sed -i 's/^bind-address/#bind-address' /etc/mysql/my.cnf
+# !! NEED to deal with apparmor and my.cnf being different
 mv /etc/init/mysql.conf /root/mysql.conf.orig
 
 ## COUCHDB

data/lib/cluster/cli.rb

@@ -127,6 +127,16 @@ class Cluster
       end
     end
 
+    def remove(name)
+      ins = @sub.instances.detect {|i| i.identified_by? name }
+      if ins
+        ins.remove
+        puts "Instance removed #{ins.id}"
+      else
+        puts "No instance removed for #{name}"
+      end
+    end
+
     def add_self(name, services)
       @sub.update_instances
       ins = @sub.current_instance

data/lib/cluster/infrastructures/amazon_instance.rb

@@ -32,6 +32,10 @@ class AmazonInstance < Instance
     end
   end
 
+  def remove
+    amazon.sdb.delete_attributes amazon.domain, aws_id
+  end
+
   def dns
     if Infrastructure.in_cluster?
       private_dns_name

data/lib/cluster/instance.rb

@@ -73,13 +73,19 @@ class Instance
     case format
     when :long
       svs = if services.empty?
-              'N/S'
+              '(N/S)'
             else
               services.map {|s|
                 disabled_services.include?(s) ? "!#{s}" : s
               }.join(',')
             end
-      "#{friendly_name}\t#{svs}\t#{state}\t#{id}\t#{dns}"
+      conn = dns
+      conn = ip if !conn or conn.empty?
+      conn = "(#{private_ip_address})" if !conn or conn.empty?
+
+      nm = friendly_name
+      nm = '(N/N)' if !nm or nm.empty?
+      "#{nm}\t#{svs}\t#{state}\t#{id}\t#{conn}"
     else
       label or id
     end

data/lib/cluster/version.rb

@@ -1,11 +1,11 @@
 class Cluster
   AUTHOR = 'Simon de Boer'
-  EMAIL = 'sdeboer@InGamerSports.com'
+  EMAIL = 'sdeboer@InGamer.com'
   NAME = 'cluster'
 
   class << self
     def version
-      '0.7.2'
+      '0.7.4'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -46,7 +46,7 @@ dependencies:
 description: You need to scale, you need control, you need feedback, you need monitoring.  You
   get clustered!
 email:
-- sdeboer@InGamerSports.com
+- sdeboer@InGamer.com
 executables:
 - cluster
 extensions: []