dust-deploy 0.16.1 → 0.16.2

data/changelog.md

@@ -1,6 +1,13 @@
 Changelog
 =============
 
+0.16.2
+------------
+
+-  fixes a bug in node.get_home() and the skel recipe, resulting in files copied to / if the specified user doesn't exist
+-  adds centos support (automatic configuration) to postgres recipe
+
+
 0.16.1
 ------------
 

data/lib/dust/recipes/debsecan.rb

@@ -3,7 +3,7 @@ class Debsecan < Recipe
   def deploy
     @node.collect_facts
 
-    if @node.is_os? ['ubuntu', 'debian']
+    if @node.is_debian?
       @node.install_package 'debsecan'
 
       msg = @node.messages.add('configuring debsecan')

data/lib/dust/recipes/postgres.rb

@@ -6,7 +6,12 @@ class Postgres < Recipe
     # profile: [ dedicated|standard, zabbix, pacemaker ]
     # service_name: "service name for init scripts"
 
-    return @node.messages.add('please specify version in your config file, e.g. "version: 9.1"').failed unless @config['version']
+    if @node.uses_apt?
+      unless @config['version'] or @config['package']
+        return @node.messages.add('please specify version or package name in your config file, e.g. "version: 9.1"').failed
+      end
+    end
+
     return unless install_postgres
 
     # default cluster on debian-like systems is 'main'
@@ -47,12 +52,10 @@ class Postgres < Recipe
   def install_postgres
     if @config['package']
       package = @config['package']
-    elsif @node.uses_apt?
+    elsif @config['version']
       package = "postgresql-#{@config['version']}"
-    elsif @node.uses_emerge?
-      package = 'postgresql-server'
     else
-      return @node.messages.add('os not supported, please specify "package: <package name>" in your config').failed
+      package = 'postgresql-server'
     end
 
     @node.install_package(package)
@@ -63,19 +66,26 @@ class Postgres < Recipe
   def set_default_directories
     @config['postgresql.conf'] ||= {} # create empty config, unless present
 
-    if @config['cluster']
+    # rpm systems place the configuration in the data dir
+    if @node.uses_rpm?
+      @config['postgresql.conf']['data_directory'] ||= '/var/lib/pgsql/data'
+      @config['conf_directory'] ||= @config['postgresql.conf']['data_directory']
+
+    # apt systems specify a cluster for their postgres instances
+    elsif @node.uses_apt?
       @config['conf_directory'] ||= "/etc/postgresql/#{@config['version']}/#{@config['cluster']}"
       @config['postgresql.conf']['data_directory'] ||= "/var/lib/postgresql/#{@config['version']}/#{@config['cluster']}"
+
+    # other systems just use this defaults
     else
       @config['conf_directory'] ||= "/etc/postgresql-#{@config['version']}"
       @config['postgresql.conf']['data_directory'] ||= "/var/lib/postgresql/#{@config['version']}/data"
     end
 
+    # set the postgres service name
     if @node.uses_emerge?
       @config['service_name'] ||= "postgresql-#{@config['version']}"
     else
-      # on non-debian and non-emerge systems, print a warning since I'm not sure if service name is correct.
-      @node.messages.add('service_name not specified in config, defaulting to "postgresql"').warning unless @node.uses_apt?
       @config['service_name'] ||= 'postgresql'
     end
 

data/lib/dust/recipes/puppet.rb

@@ -0,0 +1,40 @@
+class Puppet < Recipe
+  desc 'puppet:deploy', 'installs puppet and runs specified manifsts'
+  def deploy
+    return @node.messages.add('could not install puppet').failed unless @node.install_package('puppet')
+
+    # generate temporary directory, where to put the manifests and modules
+    tmpdir = @node.mktemp(:type => 'directory')
+
+    @config.each do |manifest, arguments|
+
+      unless File.exists?("#{@template_path}/#{manifest}")
+        @node.messages.add("couldn't find puppet module '#{manifest}").failed
+        next
+      end
+
+      @node.scp("#{@template_path}/#{manifest}", "#{tmpdir}/#{manifest}")
+
+      # if manifest is just a simple file, exec
+      if manifest =~ /\.pp$/
+        msg = @node.messages.add("applying puppet manifest '#{manifest}'")
+        ret = @node.exec("puppet apply -e \"$(cat #{tmpdir}/#{manifest})\"", :live => true)
+
+      # if it's a module, include it
+      else
+        msg = @node.messages.add("applying puppet module '#{manifest}'")
+        ret = @node.exec("puppet apply -e \"include #{manifest}\" --modulepath #{tmpdir}", :live => true)
+      end
+
+      msg.parse_result(ret[:exit_code])
+
+
+      # TODO
+      # either remove manifests, or make them run periodically using a cronjob
+    end
+  end
+
+  desc 'puppet:status', 'shows puppet status'
+  def status
+  end
+end

data/lib/dust/recipes/skel.rb

@@ -1,11 +1,17 @@
 class Skel < Recipe
   desc 'skel:deploy', 'copy default configuration files to users home directory'
-  def deploy 
+  def deploy
     @config.to_array.each do |user|
+      home = @node.get_home(user)
+      unless home
+        @node.messages.add("couldn't find home directory for user #{user}").failed
+        next
+      end
+
       @node.messages.add("deploying homedir skeleton for #{user}\n")
       Dir["#{@template_path}/.*"].each do |file|
         next unless File.file?(file)
-        @node.deploy_file(file, "#{@node.get_home(user)}/#{File.basename(file)}", { :binding => binding, :indent => 2 })
+        @node.deploy_file(file, "#{home}/#{File.basename(file)}", { :binding => binding, :indent => 2 })
       end
     end
   end

data/lib/dust/recipes/zabbix_agent.rb

@@ -28,7 +28,7 @@ class ZabbixAgent < Recipe
     if @node.uses_apt?
       # debsecan is needed for zabbix checks (security updates)
       return false unless @node.install_package 'zabbix-agent'
-      return false unless @node.install_package 'debsecan'
+      return false unless @node.install_package 'debsecan' if @node.is_debian?
 
     elsif @node.uses_emerge?
       # glsa-check (part of gentoolkit) is needed for zabbix checks (security updates)
@@ -134,9 +134,12 @@ class ZabbixAgent < Recipe
 
   # check for security patches and system updates on emerge systems
   def enable_apt
-    [ 'debian.updates,aptitude search \'~U\' |wc -l',
-      'debian.security,debsecan --suite squeeze --only-fixed --format packages |wc -l'
-    ]
+    updates = [ 'apt.updates,aptitude search \'~U\' |wc -l' ]
+    if @node.is_debian?
+      @node.collect_facts
+      updates << "debian.security,debsecan --suite #{@node['lsbdistcodename']} --only-fixed --format packages |wc -l"
+    end
+    updates
   end
 
   # check for security patches and system updates on emerge systems

data/lib/dust/server.rb

@@ -382,7 +382,7 @@ module Dust
           return ret
 
         elsif uses_rpm?
-          msg = messages.add("installing #{package}", options)                             
+          msg = messages.add("installing #{package}", options)
           return msg.parse_result(exec("rpm -U #{package}")[:exit_code])
 
         else
@@ -798,7 +798,7 @@ module Dust
 
       msg = messages.add("getting home directory of #{user}", options)
       ret = exec("getent passwd |cut -d':' -f1,6 |grep '^#{user}' |head -n1 |cut -d: -f2")
-      if msg.parse_result(ret[:exit_code])
+      if msg.parse_result(ret[:exit_code]) and not ret[:stdout].chomp.empty?
         return ret[:stdout].chomp
       else
         return false

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.16.1"
+  VERSION = "0.16.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -189,6 +189,7 @@ files:
 - lib/dust/recipes/packages.rb
 - lib/dust/recipes/postfix.rb
 - lib/dust/recipes/postgres.rb
+- lib/dust/recipes/puppet.rb
 - lib/dust/recipes/rc_local.rb
 - lib/dust/recipes/redis.rb
 - lib/dust/recipes/remove_packages.rb
@@ -225,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dust-deploy
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: small server deployment tool for complex environments