loe-icagent 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/bin/icagent

@@ -24,7 +24,10 @@ require 'rubygems'
 require File.dirname(__FILE__) + '/../lib/iclassify'
 require 'optparse'
 
-config = {}
+config = {
+  :uuidfile => '/etc/icagent/icagent.uuid',
+  :directory => File.dirname(__FILE__) + '/../recipes'
+}
 
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [-d DIR|-r FILE] (options)"

data/icagent.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{icagent}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["W. Andrew Loe III"]
@@ -26,10 +26,8 @@ Gem::Specification.new do |s|
      "lib/iclassify/node.rb",
      "recipes/00_facter.rb",
      "recipes/01_default_class.rb",
-     "recipes/02_apache_server.rb",
      "recipes/02_ec2.rb",
      "recipes/02_mongrel_server.rb",
-     "recipes/02_puppet_env.rb",
      "recipes/03_mysql_server.rb"
   ]
   s.homepage = %q{http://github.com/loe/icagent}

data/recipes/00_facter.rb

@@ -3,7 +3,7 @@
 # iClassify.
 #
 
-ENV['FACTERLIB'] = '/var/lib/puppet/lib/facter'  
+ENV['FACTERLIB'] = '/var/lib/puppet/lib/facter'
 require 'rubygems'
 require 'facter'
 

data/recipes/02_mongrel_server.rb

@@ -2,8 +2,8 @@
 # Configure how many mongrels a server should have
 # 
 
-mongrel_size = 60
-head_room = 1024
+mongrel_size = 120
+head_room = 512
 
 total_memory = attrib?("memorysize")
 if total_memory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: loe-icagent
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - W. Andrew Loe III
@@ -76,10 +76,8 @@ files:
 - lib/iclassify/node.rb
 - recipes/00_facter.rb
 - recipes/01_default_class.rb
-- recipes/02_apache_server.rb
 - recipes/02_ec2.rb
 - recipes/02_mongrel_server.rb
-- recipes/02_puppet_env.rb
 - recipes/03_mysql_server.rb
 has_rdoc: false
 homepage: http://github.com/loe/icagent

data/recipes/02_apache_server.rb

@@ -1,6 +0,0 @@
-# # 
-# # Apache should listen on 80, 443 by default.
-# #
-# 
-# add_attrib("apache_listen_ports", [ 80, 443 ]) unless attrib?("apache_listen_ports")
-# 

data/recipes/02_puppet_env.rb

@@ -1,17 +0,0 @@
-#
-# Set up our puppet environment
-# 
-
-unless attrib?("puppet_env")
-  hostname = attrib?("hostname")
-  fqdn = attrib?("fqdn")
-  if fqdn =~ /amazonaws.com$/
-    replace_attrib("puppet_env", "production")
-  else
-    if hostname =~ /^.+?\d+(.+)$/
-      replace_attrib("puppet_env", $1)
-    else
-      replace_attrib("puppet_env", "production")
-    end
-  end
-end