dust-deploy 0.12.2 → 0.13.0

data/lib/dust/recipes/limits.rb

@@ -9,47 +9,55 @@ class Limits < Recipe
               'sigpending', 'msgqueue', 'nice', 'rtprio', 'chroot' ]
 
     unless @node.dir_exists? '/etc/security/limits.d'
-      return ::Dust.print_failed 'your system does not support /etc/security/limits.d'
+      return @node.messages.add('your system does not support /etc/security/limits.d').failed
     end
-    puts
+
+    clean
 
     @config.each do |name, rules|
       limits_conf = ''
-      ::Dust.print_msg "assembling system limits according to rule '#{name}'\n"
+      @node.messages.add("assembling system limits according to rule '#{name}'\n")
       rules.to_array.each do |rule|
 
         # check if entry is valid
         unless rule['domain']
-          ::Dust.print_failed "domain cannot be empty, skipping", :indent => 2
+          @node.messages.add("domain cannot be empty, skipping", :indent => 2).failed
           next
         end
 
         unless rule['value']
-          ::Dust.print_failed "value cannot be empty, skipping", :indent => 2
+          @node.messages.add("value cannot be empty, skipping", :indent => 2).failed
           next
         end
 
         unless items.include? rule['item']
-          ::Dust.print_failed "'#{rule['item']}' is not a valid item, skipping. valid items: #{items.join(',')}", :indent => 2
+          @node.messages.add("'#{rule['item']}' is not a valid item, skipping. valid items: #{items.join(',')}", :indent => 2).failed
           next
         end
 
         unless types.include? rule['type']
-          ::Dust.print_failed "'#{rule['type']}' is not a valid type, skipping. valid types: #{types.join(',')}", :indent => 2
+          @node.messages.add("'#{rule['type']}' is not a valid type, skipping. valid types: #{types.join(',')}", :indent => 2).failed
           next
         end
 
         # assemble rule
         line = "#{rule['domain']}\t#{rule['type']}\t#{rule['item']}\t#{rule['value']}\n"
-        ::Dust.print_ok "adding '#{line.chomp}'", :indent => 2
+        @node.messages.add("adding '#{line.chomp}'", :indent => 2).ok
         limits_conf << line
       end
 
       # deploy rule file
-      ::Dust.print_msg "deploying limits to /etc/security/limits.d/#{name}"
-      ::Dust.print_result @node.write("/etc/security/limits.d/#{name}", limits_conf, :quiet => true)
-      puts
+      msg = @node.messages.add("deploying limits to /etc/security/limits.d/#{name}")
+      msg.parse_result(@node.write("/etc/security/limits.d/#{name}", limits_conf, :quiet => true))
     end
   end
 
+
+  private
+
+  # removes all files in /etc/security/limits.d
+  def clean
+    msg = @node.messages.add('cleaning all files from /etc/security/limits.d')
+    msg.parse_result(@node.rm('/etc/security/limits.d/*', :quiet => true))
+  end
 end

data/lib/dust/recipes/locale.rb

@@ -1,36 +1,36 @@
 class Locale < Recipe
   desc 'locale:deploy', 'configures system locale'
-  def deploy 
+  def deploy
     # ubuntu needs a proper language pack
     language = @config.split('_').first
     @node.install_package "language-pack-#{language}-base" if @node.is_ubuntu?
-    
+
     if @node.uses_apt?
-      ::Dust.print_msg "setting locale to '#{@config}'"
+      msg = @node.messages.add("setting locale to '#{@config}'")
       @node.write '/etc/default/locale', "LANGUAGE=#{@config}\nLANG=#{@config}\nLC_ALL=#{@config}\nLC_CTYPE=#{@config}\n", :quiet => true
-      ::Dust.print_ok
+      msg.ok
     elsif @node.uses_rpm?
-      ::Dust.print_msg "setting locale to '#{@config}'"
+      msg = @node.messages.add("setting locale to '#{@config}'")
       @node.write '/etc/sysconfig/i18n', "LANG=\"#{@config}\"\nLC_ALL=\"#{@config}\"\nSYSFONT=\"latarcyrheb-sun16\"\n", :quiet => true
-      ::Dust.print_ok
+      msg.ok
     else
-      ::Dust.print_failed 'os not supported'
+      @node.message.add('os not supported').failed
     end
   end
-  
+
   desc 'locale:status', 'shows current locale'
   def status
-    ::Dust.print_msg 'getting current locale'
+    msg = @node.messages.add('getting current locale')
 
     if @node.uses_apt?
       ret = @node.exec 'cat /etc/default/locale'
     elsif @node.uses_rpm?
       ret = @node.exec 'cat /etc/sysconfig/i18n'
     else
-      return ::Dust.print_failed
+      return msg.failed
     end
-    
-    ::Dust.print_result ret[:exit_code]
-    ::Dust.print_ret ret
-  end  
+
+    msg.parse_result(ret[:exit_code])
+    msg.print_output(ret)
+  end
 end

data/lib/dust/recipes/logrotate.rb

@@ -4,10 +4,10 @@ class Logrotate < Recipe
     return unless @node.install_package 'logrotate'
     
     @config.each do |name, rule|
-      ::Dust.print_msg "deploying logrotate entry for '#{name}'\n"
+      @node.messages.add("deploying logrotate entry for '#{name}'\n")
 
       unless rule['path']
-        ::Dust.print_failed 'path not specified', :indent => 2
+        @node.messages.add('path not specified', :indent => 2).failed
         next
       end
       
@@ -30,7 +30,7 @@ class Logrotate < Recipe
 
   desc 'logrotate:status', 'displays filenames of installed logrotate rules'
   def status
-    ::Dust.print_ret @node.exec('ls /etc/logrotate.d/*')
+    @node.messages.add.print_output(@node.exec('ls /etc/logrotate.d/*'))
   end
 
 

data/lib/dust/recipes/make.rb

@@ -0,0 +1,29 @@
+class Make < Recipe
+  desc 'make:deploy', 'configure, make, make install'
+  def deploy 
+    # install dependencies (defaults, build-essential | make, gcc)
+    @node.install_package 'build-essential'
+
+    # create temporary directory
+    ret = @node.exec 'mktemp -d --tmpdir dust_make.XXXXXXXXX'
+    return ::Dust.print_failed 'error creating temporary directory' if ret[:exit_code] != 0
+    tempdir = ret[:stdout].chomp
+
+    url = 'http://www.securixlive.com/download/barnyard2/barnyard2-1.9.tar.gz'
+
+    if url =~ /\.(tar.gz|tgz)$/
+    elsif url.end_with? '.tar.bz2'
+    elsif url.end_with? '.zip'
+    else
+    end
+
+    # if @config['svn']
+    # if @config['git']
+
+    # get url, svn, git repository
+    # unpack bz2, tgz, zip
+   
+    # run commands (default [ './configure --prefix=/usr/local/', 'make', 'make install' ]
+    # symlink
+  end
+end

data/lib/dust/recipes/motd.rb

@@ -6,9 +6,9 @@ class Motd < Recipe
   
   desc 'motd:status', 'shows current message of the day'
   def status
-    ::Dust.print_msg 'getting /etc/motd'
+    msg = @node.messages.add('getting /etc/motd')
     ret = @node.exec 'cat /etc/motd'
-    ::Dust.print_result ret[:exit_code]
-    ::Dust.print_ret ret
+    msg.parse_result(ret[:exit_code])
+    msg.print_output(ret)
   end  
 end

data/lib/dust/recipes/mysql.rb

@@ -6,11 +6,11 @@ class Mysql < Recipe
 
     @config = default_config.deep_merge @config
 
-    ::Dust.print_msg "configuring mysql\n"
-    ::Dust.print_ok "listen on #{@config['mysqld']['bind-address']}:#{@config['mysqld']['port']}", :indent => 2
+    @node.messages.add("configuring mysql\n")
+    @node.messages.add("listen on #{@config['mysqld']['bind-address']}:#{@config['mysqld']['port']}", :indent => 2).ok
 
     @config['mysqld']['innodb_buffer_pool_size'] ||= get_innodb_buffer_pool_size
-    ::Dust.print_ok "set innodb buffer pool to '#{@config['mysqld']['innodb_buffer_pool_size']}'", :indent => 2
+    @node.messages.add("set innodb buffer pool to '#{@config['mysqld']['innodb_buffer_pool_size']}'", :indent => 2).ok
 
     @node.write '/etc/mysql/my.cnf', generate_my_cnf
 
@@ -78,7 +78,7 @@ class Mysql < Recipe
     # allocate 70% of the available ram to mysql
     # but leave max 1gb to system
     unless @config['mysqld']['innodb_buffer_pool_size']
-      ::Dust.print_msg 'autoconfiguring innodb buffer size', :indent => 2
+      msg = @node.messages.add('autoconfiguring innodb buffer size', :indent => 2)
       @node.collect_facts :quiet => true
 
       # get system memory (in kb)
@@ -87,7 +87,7 @@ class Mysql < Recipe
       # allocate 80% of the available ram to mysql
       buffer_pool = (system_mem * 0.7).to_i
 
-      ::Dust.print_ok
+      msg.ok
       "#{buffer_pool / 1024}M"
     end
   end

data/lib/dust/recipes/newrelic.rb

@@ -1,21 +1,21 @@
 class Newrelic < Recipe
   desc 'newrelic:deploy', 'installs and configures newrelic system monitoring'
-  def deploy 
+  def deploy
     return Dust.print_failed 'no key specified' unless @config
     return unless @node.uses_apt? :quiet=>false
 
     if @options.restart? or @options.reload?
-      ::Dust.print_msg 'updating repositories'
-      ::Dust.print_result @node.exec('aptitude update')[:exit_code]
+      msg = @node.messages.add('updating repositories')
+      msg.parse_result(@node.exec('aptitude update')[:exit_code])
     end
 
     unless @node.install_package 'newrelic-sysmond'
-      ::Dust.print_failed 'installing newrelic monitoring daemon failed, did you setup the newrelic repositories?'
+      @node.messages.add('installing newrelic monitoring daemon failed, did you setup the newrelic repositories?').failed
       return
     end
 
-    ::Dust.print_msg 'configuring new relic server monitoring tool'
-    return unless ::Dust.print_result @node.exec("nrsysmond-config --set ssl=true license_key=#{@config}")[:exit_code]
+    msg = @node.messages.add('configuring new relic server monitoring tool')
+    return unless msg.parse_result(@node.exec("nrsysmond-config --set ssl=true license_key=#{@config}")[:exit_code])
 
     @node.restart_service 'newrelic-sysmond' if options.restart?
   end

data/lib/dust/recipes/nginx.rb

@@ -7,35 +7,35 @@ class Nginx < Recipe
     @node.deploy_file "#{@template_path}/nginx.conf", '/etc/nginx/nginx.conf'
 
     # remove old sites that may be present
-    ::Dust.print_msg 'deleting old sites in /etc/nginx/sites-*'
+    msg = @node.messages.add('deleting old sites in /etc/nginx/sites-*')
     @node.rm '/etc/nginx/sites-*/*', :quiet => true
-    ::Dust.print_ok
+    msg.ok
 
     @config.each do |state, sites|
       sites.to_array.each do |site|
         @node.deploy_file "#{@template_path}/sites/#{site}", "/etc/nginx/sites-available/#{site}", :binding => binding
-    
+
         # symlink to sites-enabled if this is listed as an enabled site
         if state == 'sites-enabled'
-          ::Dust.print_msg "enabling #{site}", :indent => 2
-          ::Dust.print_result @node.exec("cd /etc/nginx/sites-enabled && ln -s ../sites-available/#{site} #{site}")[:exit_code]
+          msg = @node.messages.add("enabling #{site}", :indent => 2)
+          msg.parse_result(@node.exec("cd /etc/nginx/sites-enabled && ln -s ../sites-available/#{site} #{site}")[:exit_code])
         end
       end
     end
 
     # check configuration and restart nginx
-    ::Dust.print_msg 'checking nginx configuration'
+    msg = @node.messages.add('checking nginx configuration')
     if @node.exec('/etc/init.d/nginx configtest')[:exit_code] == 0
-      ::Dust.print_ok
+      msg.ok
       @node.restart_service('nginx') if options.restart?
     else
-      ::Dust.print_failed
+      msg.failed
     end
   end
-  
+
   desc 'nginx:status', 'displays nginx status'
   def status
     return unless @node.package_installed? 'nginx'
     @node.print_service_status 'nginx'
-  end  
+  end
 end

data/lib/dust/recipes/ntpd.rb

@@ -4,20 +4,16 @@ class Ntpd < Recipe
     # warn if other ntp package is installed
     [ 'openntpd', 'chrony' ].each do |package|
       if @node.package_installed? package, :quiet => true
-        ::Dust.print_warning "#{package} installed, might conflict with ntpd, might be deleted" 
+        @node.messages.add("#{package} installed, might conflict with ntpd, might be deleted").warning
       end
     end
 
     @node.install_package 'ntp'
-    
+
     service = @node.uses_apt? ? 'ntp' : 'ntpd'
 
     @node.autostart_service service
     @node.restart_service service if options.restart?
   end
-
-
-  private
-
 end
 

data/lib/dust/recipes/pacemaker.rb

@@ -35,9 +35,9 @@ class Pacemaker < Recipe
   
   desc 'pacemaker:status', 'shows status of pacemaker/corosync cluster'
   def status
-    ::Dust.print_msg 'running crm_mon'
+    msg = @node.messages.add('running crm_mon')
     ret = @node.exec 'crm_mon -1'
-    ::Dust.print_result ret[:exit_code]
-    ::Dust.print_ret ret
+    msg.parse_result(ret[:exit_code])
+    msg.print_output(ret)
   end 
 end

data/lib/dust/recipes/postgres.rb

@@ -6,7 +6,7 @@ class Postgres < Recipe
     # profile: [ dedicated|standard, zabbix, pacemaker ]
     # service_name: "service name for init scripts"
 
-    return ::Dust.print_failed 'please specify version in your config file, e.g. "version: 9.1"' unless @config['version']
+    return @node.messages.add('please specify version in your config file, e.g. "version: 9.1"').failed unless @config['version']
     return unless install_postgres
 
     # default cluster on debian-like systems is 'main'
@@ -52,7 +52,7 @@ class Postgres < Recipe
     elsif @node.uses_emerge?
       package = 'postgresql-server'
     else
-      return ::Dust.print_failed 'os not supported, please specify "package: <package name>" in your config'
+      return @node.messages.add('os not supported, please specify "package: <package name>" in your config').failed
     end
 
     @node.install_package package
@@ -75,7 +75,7 @@ class Postgres < Recipe
       @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.
-      Dust.print_warning 'service_name not specified in config, defaulting to "postgresql"' unless @node.uses_apt?
+      @node.messages.add('service_name not specified in config, defaulting to "postgresql"').warning unless @node.uses_apt?
       @config['service_name'] ||= 'postgresql'
     end
 
@@ -164,31 +164,31 @@ class Postgres < Recipe
     @node.collect_facts :quiet => true
     system_mem = ::Dust.convert_size(@node['memorysize']).to_f
 
-    ::Dust.print_msg "calculating recommended settings for a dedicated databse server with #{kb2mb system_mem} ram\n"
+    msg = @node.messages.add("calculating recommended settings for a dedicated databse server with #{kb2mb system_mem} ram\n")
 
     # every connection uses up to work_mem memory, so make sure that even if
     # max_connections is reached, there's still a bit left.
     # total available memory / (2 * max_connections)
     @config['postgresql.conf']['work_mem'] ||= kb2mb(system_mem * 0.9 / @config['postgresql.conf']['max_connections'])
-    ::Dust.print_ok "work_mem: #{@config['postgresql.conf']['work_mem']}", :indent => 2
+    @node.messages.add("work_mem: #{@config['postgresql.conf']['work_mem']}", :indent => 2).ok
 
     # shared_buffers should be 0.2 - 0.3 of system ram
     # unless ram is lower than 1gb, then less (32mb maybe)
     @config['postgresql.conf']['shared_buffers'] ||= kb2mb(system_mem * 0.25)
-    ::Dust.print_ok "shared_buffers: #{@config['postgresql.conf']['shared_buffers']}", :indent => 2
+    @node.messages.add("shared_buffers: #{@config['postgresql.conf']['shared_buffers']}", :indent => 2).ok
 
     # maintenance_work_mem, should be a lot higher than work_mem
     # recommended value: 50mb for each 1gb of system ram
     @config['postgresql.conf']['maintenance_work_mem'] ||= kb2mb(system_mem / 1024 * 50)
-    ::Dust.print_ok "maintenance_work_mem: #{@config['postgresql.conf']['maintenance_work_mem']}", :indent => 2
+    @node.messages.add("maintenance_work_mem: #{@config['postgresql.conf']['maintenance_work_mem']}", :indent => 2).ok
 
     # effective_cache_size between 0.6 and 0.8 of system ram
     @config['postgresql.conf']['effective_cache_size'] ||= kb2mb(system_mem * 0.75)
-    ::Dust.print_ok "effective_cache_size: #{@config['postgresql.conf']['effective_cache_size']}", :indent => 2
+    @node.messages.add("effective_cache_size: #{@config['postgresql.conf']['effective_cache_size']}", :indent => 2).ok
 
     # wal_buffers should be between 2-16mb
     @config['postgresql.conf']['wal_buffers'] ||= '12MB'
-    ::Dust.print_ok "wal_buffers: #{@config['postgresql.conf']['wal_buffers']}", :indent => 2
+    @node.messages.add("wal_buffers: #{@config['postgresql.conf']['wal_buffers']}", :indent => 2).ok
   end
 
   # converts plain kb value to "1234MB"
@@ -221,35 +221,35 @@ class Postgres < Recipe
   # adds zabbix user to postgres group
   # creates zabbix user in postgres and grant access to postgres database
   def configure_for_zabbix
-    ::Dust.print_msg "configuring postgres for zabbix monitoring\n"
-    ::Dust.print_msg 'adding zabbix user to postgres group', :indent => 2
-    ::Dust.print_result @node.exec('usermod -a -G postgres zabbix')[:exit_code]
+    @node.messages.add("configuring postgres for zabbix monitoring\n")
+    msg = @node.messages.add('adding zabbix user to postgres group', :indent => 2)
+    msg.parse_result(@node.exec('usermod -a -G postgres zabbix')[:exit_code])
 
     if is_master? :indent => 2
-      ::Dust.print_msg 'checking if zabbix user exists in postgres', :indent => 3
-      ret = ::Dust.print_result @node.exec('psql -U postgres -c ' +
+      msg = @node.messages.add('checking if zabbix user exists in postgres', :indent => 3)
+      ret = msg.parse_result(@node.exec('psql -U postgres -c ' +
                                            '  "SELECT usename FROM pg_user WHERE usename = \'zabbix\'"' +
-                                           '  postgres |grep -q zabbix')[:exit_code]
+                                           '  postgres |grep -q zabbix')[:exit_code])
 
       # if user was not found, create him
       unless ret
-        ::Dust.print_msg 'create zabbix user in postgres', :indent => 4
-        ::Dust.print_result @node.exec('createuser -U postgres zabbix -RSD')[:exit_code]
+        msg = @node.messages.add('create zabbix user in postgres', :indent => 4)
+        msg.parse_result(@node.exec('createuser -U postgres zabbix -RSD')[:exit_code])
       end
 
-      ::Dust.print_msg 'GRANT zabbix user access to postgres database', :indent => 3
-      ::Dust.print_result( @node.exec('psql -U postgres -c "GRANT SELECT ON pg_stat_database TO zabbix" postgres')[:exit_code] )
+      msg = @node.messages.add('GRANT zabbix user access to postgres database', :indent => 3)
+      msg.parse_result(@node.exec('psql -U postgres -c "GRANT SELECT ON pg_stat_database TO zabbix" postgres')[:exit_code])
     end
   end
 
   # checks if this server is a postgres master
   def is_master? options = {}
-    ::Dust.print_msg 'checking if this host is the postgres master: ', options
+    msg = @node.messages.add('checking if this host is the postgres master: ', options)
     if @node.file_exists? "#{@config['postgresql.conf']['data_directory']}/recovery.done", :quiet => true
-      ::Dust.print_ok 'yes', :indent => 0
+      msg.ok('yes')
       return true
       else
-      ::Dust.print_ok 'no', :indent => 0
+      msg.ok('no')
       return false
     end
   end

data/lib/dust/recipes/rc_local.rb

@@ -3,13 +3,13 @@ class RcLocal < Recipe
   def deploy
 
     if @node.uses_apt?
-      ::Dust.print_msg "configuring custom startup script\n"
+      @node.messages.add("configuring custom startup script\n")
 
       rc = ''
       @config.to_array.each do |cmd|
-        ::Dust.print_msg "adding command: #{cmd}", :indent => 2
+        msg = @node.messages.add("adding command: #{cmd}", :indent => 2)
         rc << "#{cmd}\n"
-        ::Dust.print_ok
+        msg.ok
       end
       rc << "\nexit 0\n"
 
@@ -17,15 +17,15 @@ class RcLocal < Recipe
       @node.chown 'root:root', '/etc/rc.local'
       @node.chmod '755', '/etc/rc.local'
     else
-      ::Dust.print_failed 'os not supported'
+      @node.messages.add('os not supported').failed
     end
   end
-  
+
   desc 'rc_local:status', 'shows current /etc/rc.local'
   def status
-    ::Dust.print_msg 'getting /etc/rc.local'
+    msg = @node.messages.add('getting /etc/rc.local')
     ret = @node.exec 'cat /etc/rc.local'
-    ::Dust.print_result ret[:exit_code]
-    ::Dust.print_ret ret
+    msg.parse_result(ret[:exit_code])
+    msg.print_output(ret)
   end
 end