dust-deploy 0.2.3 → 0.3.0

data/lib/dust/recipes/aliases.rb

@@ -6,7 +6,7 @@ class Aliases < Thor
     return unless node.package_installed? 'postfix'
     node.scp "#{template_path}/aliases", '/etc/aliases'
 
-    ::Dust.print_msg 'running newaliases', 1
+    ::Dust.print_msg 'running newaliases'
     ::Dust.print_result node.exec('newaliases')[:exit_code]
   end
 end

data/lib/dust/recipes/basic_setup.rb

@@ -6,28 +6,28 @@ class BasicSetup < Thor
     # install some basic packages
     ::Dust.print_msg "installing basic packages\n"
 
-    node.install_package 'screen', false, 2
-    node.install_package 'rsync', false, 2
-    node.install_package 'psmisc', false, 2 if node.uses_apt? true
+    node.install_package 'screen', :indent => 2
+    node.install_package 'rsync', :indent => 2
+    node.install_package 'psmisc', :indent => 2 if node.uses_apt?
 
-    if node.uses_rpm? true
-      node.install_package 'vim-enhanced', false, 2
+    if node.uses_rpm?
+      node.install_package 'vim-enhanced', :indent => 2
     else
-      node.install_package 'vim', false, 2
+      node.install_package 'vim', :indent => 2
     end
 
-    if node.uses_apt? true
-      node.install_package 'git-core', false, 2
+    if node.uses_apt?
+      node.install_package 'git-core', :indent => 2
     else
-      node.install_package 'git', false, 2
+      node.install_package 'git', :indent => 2
     end
     puts
     
     # deploy basic configuration for root user
-    ::Dust.print_msg "deploying configuration files for root\n", 1
+    ::Dust.print_msg "deploying configuration files for root\n"
     Dir["#{template_path}/.*"].each do |file|
-      next unless File.file?(file)
-      node.scp file, "/root/#{File.basename(file)}", false, 2
+      next unless File.file? file
+      node.scp file, "/root/#{File.basename file}", :indent => 2
     end
 
   end

data/lib/dust/recipes/debsecan.rb

@@ -1,7 +1,9 @@
 class Debsecan < Thor
   desc 'debsecan:deploy', 'installs and configures debian security package "debsecan"'
   def deploy node, config, options
-    if node.is_os? ['debian', 'ubuntu'], true
+    node.collect_facts
+
+    if node.is_os? ['ubuntu', 'debian']
       node.install_package 'debsecan'
 
       ::Dust.print_msg 'configuring debsecan'
@@ -34,7 +36,7 @@ class Debsecan < Thor
                      "# built-in default.\n" +
                      "SOURCE=#{config['source']}\n\n"
 
-      node.write '/etc/default/debsecan', config_file, true
+      node.write '/etc/default/debsecan', config_file, :quiet => true
       ::Dust.print_ok
     else
       ::Dust.print_failed 'os not supported'

data/lib/dust/recipes/duplicity.rb

@@ -33,15 +33,15 @@ class Duplicity < Thor
       # check whether we need ncftp
       node.install_package 'ncftp' if config['backend'].include? 'ftp://'
       
-      # scp backend on centos needs python-pexpect
-      node.install_package 'python-pexpect' if config['backend'].include? 'scp://' and node.uses_rpm? true
+      # scp backend on centos needs python-pexpect (not needed anymore for newer systems)
+      # node.install_package 'python-pexpect' if config['backend'].include? 'scp://' and node.uses_rpm?
 
       # add hostkey to known_hosts
       if config['hostkey']
         ::Dust.print_msg 'checking if ssh key is in known_hosts'
         unless ::Dust.print_result node.exec("grep -q '#{config['hostkey']}' ~/.ssh/known_hosts")[:exit_code] == 0
-          node.mkdir '~/.ssh', false, 2
-          node.append '~/.ssh/known_hosts', config['hostkey'], false, 2
+          node.mkdir '~/.ssh', :indent => 2
+          node.append '~/.ssh/known_hosts', config['hostkey'], :indent => 2
         end
       end
 
@@ -51,7 +51,7 @@ class Duplicity < Thor
       # adjust and upload cronjob
       template = ERB.new File.read("#{template_path}/cronjob.erb"), nil, '%<>'
       ::Dust.print_msg "adjusting and deploying cronjob (scenario: #{scenario}, interval: #{config['interval']})\n"
-      config['options'].each { |option| ::Dust.print_ok "adding option: #{option}", 2 }
+      config['options'].each { |option| ::Dust.print_ok "adding option: #{option}", :indent => 2 }
       node.write cronjob_path, template.result(binding)
  
       # making cronjob executeable
@@ -90,9 +90,9 @@ class Duplicity < Thor
       ::Dust.print_result( (ret[:exit_code] == 0 and ret[:stdout].length > 0) )
 
       if options.long?
-        ::Dust.print_msg "#{::Dust.black}#{ret[:stdout]}#{::Dust.none}", 0
+        ::Dust.print_msg "#{::Dust.black}#{ret[:stdout]}#{::Dust.none}", :indent => 0
       else
-        ::Dust.print_msg "\t#{::Dust.black}#{ret[:stdout].sub(/^\s+([a-zA-Z]+)\s+(\w+\s+\w+\s+\d+\s+\d+:\d+:\d+\s+\d+)\s+(\d+)$/, 'Last backup: \1 (\3 sets) on \2')}#{::Dust.none}", 0
+        ::Dust.print_msg "\t#{::Dust.black}#{ret[:stdout].sub(/^\s+([a-zA-Z]+)\s+(\w+\s+\w+\s+\d+\s+\d+:\d+:\d+\s+\d+)\s+(\d+)$/, 'Last backup: \1 (\3 sets) on \2')}#{::Dust.none}", :indent => 0
       end
 
       puts
@@ -103,7 +103,7 @@ class Duplicity < Thor
   # removes all duplicity cronjobs
   def remove_duplicity_cronjobs node
     ::Dust.print_msg 'deleting old duplicity cronjobs'
-    node.rm '/etc/cron.*/duplicity*', true
+    node.rm '/etc/cron.*/duplicity*', :quiet => true
     ::Dust.print_ok
   end
 

data/lib/dust/recipes/etc_hosts.rb

@@ -3,7 +3,7 @@ class EtcHosts < Thor
   def deploy node, daemon, options
     template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
 
-    node.scp("#{template_path}/hosts", '/etc/hosts')
+    node.scp "#{template_path}/hosts", '/etc/hosts'
 
     # restart dns service
     if options.restart? and daemon.is_a? String

data/lib/dust/recipes/iptables.rb

@@ -6,10 +6,10 @@ class Iptables < Thor
     template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
 
     # install iptables
-    if node.uses_apt? true or node.uses_emerge? true
+    if node.uses_apt? or node.uses_emerge?
       node.install_package 'iptables'
 
-    elsif node.uses_rpm? true
+    elsif node.uses_rpm?
       node.install_package 'iptables-ipv6'
 
     else
@@ -35,7 +35,7 @@ class Iptables < Thor
       iptables_script = '' 
 
       # default policy for chains
-      if node.uses_apt? true or node.uses_emerge? true
+      if node.uses_apt? or node.uses_emerge?
         iptables_script += rules['input'] ? "-P INPUT DROP\n" : "-P INPUT ACCEPT\n"
         iptables_script += rules['output'] ? "-P OUTPUT DROP\n" : "-P OUTPUT ACCEPT\n"
         iptables_script += rules['forward'] ? "-P FORWARD DROP\n" : "-P FORWARD ACCEPT\n"
@@ -44,7 +44,7 @@ class Iptables < Thor
         iptables_script += "-F -t nat\n" if ipv4
         iptables_script += "-X\n"
 
-      elsif node.uses_rpm? true
+      elsif node.uses_rpm?
         iptables_script += "*filter\n"
 
         iptables_script += rules['input'] ? ":INPUT DROP [0:0]\n" : ":INPUT ACCEPT [0:0]\n"
@@ -54,7 +54,7 @@ class Iptables < Thor
 
       # map rules to iptables strings
       rules.each do |chain, chain_rules|
-        ::Dust.print_msg "#{::Dust.pink}#{chain.upcase}#{::Dust.none}\n", 2
+        ::Dust.print_msg "#{::Dust.pink}#{chain.upcase}#{::Dust.none}\n", :indent => 2
         chain_rules.sort.each do |name, rule|
           # set default variables
           rule['jump'] ||= ['ACCEPT']
@@ -69,42 +69,49 @@ class Iptables < Thor
 
           parse_rule(rule).each do |r|
             # TODO: parse nicer output
-            ::Dust.print_msg "#{name}:#{::Dust.grey 0} '#{r.join ' ' }'#{::Dust.none}\n", 3
+            ::Dust.print_msg "#{name}:#{::Dust.grey 0} '#{r.join ' ' }'#{::Dust.none}\n", :indent => 3
             iptables_script += "-A #{chain.upcase} #{r.join ' '}\n"
           end
         end
       end
 
       # put commit statement for rpm machines
-      iptables_script += "COMMIT\n" if node.uses_rpm? true
+      iptables_script += "COMMIT\n" if node.uses_rpm?
 
       # prepend iptables command on non-centos-like machines
-      iptables_script = iptables_script.map { |s| "#{iptables} #{s}" }.to_s if node.uses_apt? true or node.uses_emerge? true
+      if node.uses_apt? or node.uses_emerge?
+        iptables_script = iptables_script.map { |s| "#{iptables} #{s}" }.to_s
+      end
 
       # set header
       header  = ''
-      header  = "#!/bin/sh\n" if node.uses_apt? true or node.uses_emerge? true
+      if node.uses_apt? or node.uses_emerge?
+        header  = "#!/bin/sh\n"
+      end
       header += "# automatically generated by dust\n\n"
       iptables_script = header + iptables_script
 
       # set the target file depending on distribution
-      target = "/etc/network/if-pre-up.d/#{iptables}" if node.uses_apt? true
-      target = "/etc/#{iptables}" if node.uses_emerge? true
-      target = "/etc/sysconfig/#{iptables}" if node.uses_rpm? true
+      target = "/etc/network/if-pre-up.d/#{iptables}" if node.uses_apt?
+      target = "/etc/#{iptables}" if node.uses_emerge?
+      target = "/etc/sysconfig/#{iptables}" if node.uses_rpm?
 
-      node.write target, iptables_script, true
+      node.write target, iptables_script, :quiet => true
 
-      node.chmod '700', target if node.uses_apt? true or node.uses_emerge? true
-      node.chmod '600', target if node.uses_rpm? true
+      if node.uses_apt? or node.uses_emerge?
+        node.chmod '700', target
+      elsif node.uses_rpm?
+        node.chmod '600', target
+      end
 
       if options.restart?
         ::Dust.print_msg 'applying ipv4 rules' if ipv4
         ::Dust.print_msg 'applying ipv6 rules' if ipv6
 
-        if node.uses_rpm? true
+        if node.uses_rpm?
           ::Dust.print_result node.exec("/etc/init.d/#{iptables} restart")[:exit_code]
 
-        elsif node.uses_apt? true or node.uses_emerge? true
+        elsif node.uses_apt? or node.uses_emerge?
           ret = node.exec target
           ::Dust.print_result( (ret[:exit_code] == 0 and ret[:stdout].empty? and ret[:stderr].empty?) )
         end
@@ -112,7 +119,7 @@ class Iptables < Thor
 
       # on gentoo, rules have to be saved using the init script,
       # otherwise they won't get re-applied on next startup
-      if node.uses_emerge? true
+      if node.uses_emerge?
         ::Dust.print_msg 'saving ipv4 rules' if ipv4
         ::Dust.print_msg 'saving ipv6 rules' if ipv6
         ::Dust.print_result node.exec("/etc/init.d/#{iptables} save")[:exit_code]

data/lib/dust/recipes/locale.rb

@@ -1,13 +1,13 @@
 class Locale < Thor
   desc 'locale:deploy', 'configures system locale'
   def deploy node, locale, options
-    if node.uses_apt? true
+    if node.uses_apt?
       ::Dust.print_msg "setting locale to '#{locale}'"
-      node.write '/etc/default/locale', "LANGUAGE=#{locale}\nLANG=#{locale}\nLC_ALL=#{locale}\nLC_CTYPE=#{locale}\n", true
+      node.write '/etc/default/locale', "LANGUAGE=#{locale}\nLANG=#{locale}\nLC_ALL=#{locale}\nLC_CTYPE=#{locale}\n", :quiet => true
       ::Dust.print_ok
-    elsif node.uses_rpm? true
+    elsif node.uses_rpm?
       ::Dust.print_msg "setting locale to '#{locale}'"
-      node.write '/etc/sysconfig/i18n', "LANG=\"#{locale}\"\nLC_ALL=\"#{locale}\"\nSYSFONT=\"latarcyrheb-sun16\"\n", true
+      node.write '/etc/sysconfig/i18n', "LANG=\"#{locale}\"\nLC_ALL=\"#{locale}\"\nSYSFONT=\"latarcyrheb-sun16\"\n", :quiet => true
       ::Dust.print_ok
     else
       ::Dust.print_failed 'os not supported'

data/lib/dust/recipes/memory_limit.rb

@@ -16,7 +16,7 @@ class MemoryLimit < Thor
     max_mem = system_mem - threshold if max_mem > threshold
 
     ::Dust.print_msg "setting max memory for a process to #{max_mem} kb"
-    node.write '/etc/security/limits.d/00-memory-limit', "*          hard    as        #{max_mem}", true
+    node.write '/etc/security/limits.d/00-memory-limit', "*          hard    as        #{max_mem}", :quiet => true
     ::Dust.print_ok
 
   end

data/lib/dust/recipes/mysql.rb

@@ -5,7 +5,7 @@ class Mysql < Thor
   def deploy node, config, options
     template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
 
-    return unless node.uses_apt?
+    return unless node.uses_apt? :quiet=>false
     node.install_package 'mysql-server'
 
     ::Dust.print_msg "configuring mysql\n"
@@ -14,7 +14,7 @@ class Mysql < Thor
     config['bind_address'] ||= '127.0.0.1'
     config['port'] ||= 3306
 
-    ::Dust.print_ok "listen on #{config['bind_address']}:#{config['port']}", 2
+    ::Dust.print_ok "listen on #{config['bind_address']}:#{config['port']}", :indent => 2
 
     config['innodb_file_per_table'] ||= 1
     config['innodb_thread_concurrency'] ||= 0
@@ -23,8 +23,8 @@ class Mysql < Thor
     # allocate 70% of the available ram to mysql
     # but leave max 1gb to system
     unless config['innodb_buffer_pool_size']
-      ::Dust.print_msg 'autoconfiguring innodb buffer size', 2
-      node.collect_facts true
+      ::Dust.print_msg 'autoconfiguring innodb buffer size', :indent => 2
+      node.collect_facts :quiet => true
 
       # get system memory (in kb)
       system_mem = ::Dust.convert_size node['memorysize']
@@ -36,7 +36,7 @@ class Mysql < Thor
       ::Dust.print_ok
     end
 
-    ::Dust.print_ok "setting innodb buffer pool to '#{config['innodb_buffer_pool_size']}'", 2
+    ::Dust.print_ok "setting innodb buffer pool to '#{config['innodb_buffer_pool_size']}'", :indent => 2
 
     template = ERB.new( File.read("#{template_path}/my.cnf.erb"), nil, '%<>')
     node.write '/etc/mysql/my.cnf', template.result(binding)

data/lib/dust/recipes/newrelic.rb

@@ -2,7 +2,7 @@ class Newrelic < Thor
   desc 'newrelic:deploy', 'installs and configures newrelic system monitoring'
   def deploy node, key, options
     return Dust.print_failed 'no key specified' unless key
-    return unless node.uses_apt?
+    return unless node.uses_apt? :quiet=>false
 
     ::Dust.print_msg 'updating repositories'
     ::Dust.print_result node.exec('aptitude update')[:exit_code]

data/lib/dust/recipes/nginx.rb

@@ -12,7 +12,7 @@ class Nginx < Thor
 
     # remove old sites that may be present
     ::Dust.print_msg 'deleting old sites in /etc/nginx/sites-*'
-    node.rm '/etc/nginx/sites-*/*', true
+    node.rm '/etc/nginx/sites-*/*', :quiet => true
     ::Dust.print_ok
 
     sites.each do |state, site|
@@ -29,13 +29,13 @@ class Nginx < Thor
 
       # skip to next site if template wasn't found
       else
-        ::Dust.print_failed "couldn't find template for #{site}", 2
+        ::Dust.print_failed "couldn't find template for #{site}", :indent => 2
         next
       end
 
       # symlink to sites-enabled if this is listed as an enabled site
       if state == 'sites-enabled'
-        ::Dust.print_msg "enabling #{site}", 2
+        ::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] )
       end
     end

data/lib/dust/recipes/postgres.rb

@@ -7,18 +7,20 @@ class Postgres < Thor
 
     return ::Dust.print_failed 'no version specified' unless config['version']
 
-    if node.uses_emerge? true
+    if node.uses_emerge?
       return unless node.package_installed? 'postgresql-server'
       config['data-dir'] ||= "/var/lib/postgresql/#{config['version']}/data"
       config['conf-dir'] ||= "/etc/postgresql-#{config['version']}"
       config['archive-dir'] ||= "/var/lib/postgresql/#{config['version']}/archive"
       config['service-name'] ||= "postgresql-#{config['version']}"
-    elsif node.uses_apt? true
+
+    elsif node.uses_apt?
       return unless node.package_installed? "postgresql-#{config['version']}"
       config['data-dir'] ||= "/var/lib/postgresql/#{config['version']}/#{config['cluster']}"
       config['conf-dir'] ||= "/etc/postgresql/#{config['version']}/#{config['cluster']}"
       config['archive-dir'] ||= "/var/lib/postgresql/#{config['version']}/#{config['cluster']}-archive"
       config['service-name'] ||= 'postgresql'
+
     else
       return 'os not supported'
     end
@@ -40,7 +42,7 @@ class Postgres < Thor
 
     # copy recovery.conf to either recovery.conf or recovery.done
     # depending on which file already exists.
-    if node.file_exists? "#{config['data-dir']}/recovery.conf", true
+    if node.file_exists? "#{config['data-dir']}/recovery.conf", :quiet => true
       deploy_file 'recovery.conf', "#{config['data-dir']}/recovery.conf", binding
     else
       deploy_file 'recovery.conf', "#{config['data-dir']}/recovery.done", binding
@@ -60,21 +62,21 @@ class Postgres < Thor
 
 
     # increase shm memory
-    if node.uses_apt? true
+    if node.uses_apt?
       ::Dust.print_msg "setting postgres sysctl keys\n"
-      node.collect_facts true
+      node.collect_facts :quiet => true
 
       # use half of system memory for shmmax
       shmmax = ::Dust.convert_size(node['memorysize']) * 1024 / 2
       shmall = shmmax / 4096 # shmmax/pagesize (pagesize = 4096)
 
-      ::Dust.print_msg "setting shmmax to: #{shmmax}", 2
+      ::Dust.print_msg "setting shmmax to: #{shmmax}", :indent => 2
       ::Dust.print_result node.exec("sysctl -w kernel.shmmax=#{shmmax}")[:exit_code]
-      ::Dust.print_msg "setting shmall to: #{shmall}", 2
+      ::Dust.print_msg "setting shmall to: #{shmall}", :indent => 2
       ::Dust.print_result node.exec("sysctl -w kernel.shmall=#{shmall}")[:exit_code]
-      ::Dust.print_msg 'setting overcommit memory to 2', 2
+      ::Dust.print_msg 'setting overcommit memory to 2', :indent => 2
       ::Dust.print_result node.exec('sysctl -w vm.overcommit_memory=2')[:exit_code]
-      ::Dust.print_msg 'setting swappiness to 0', 2
+      ::Dust.print_msg 'setting swappiness to 0', :indent => 2
       ::Dust.print_result node.exec('sysctl -w vm.swappiness=0')[:exit_code]
 
       file = ''
@@ -107,7 +109,7 @@ class Postgres < Thor
     elsif File.exists? "#{template_path}/#{file}.erb"
       ::Dust.print_msg "adjusting and deploying #{file}"
       template = ERB.new( File.read("#{template_path}/#{file}.erb"), nil, '%<>')
-      ::Dust.print_result node.write(target, template.result(binding), true)
+      ::Dust.print_result node.write(target, template.result(binding), :quiet => true)
 
     # file was not found, return
     else

data/lib/dust/recipes/rc_local.rb

@@ -2,12 +2,12 @@ class RcLocal < Thor
   desc 'rc_local:deploy', 'configures custom startup script'
   def deploy node, config, options
 
-    if node.uses_apt? true
+    if node.uses_apt?
       ::Dust.print_msg "configuring custom startup script\n"
 
       rc = ''
       config.each do |cmd|
-        ::Dust.print_msg "adding command: #{cmd}", 2
+        ::Dust.print_msg "adding command: #{cmd}", :indent => 2
         rc += "#{cmd}\n"
         ::Dust.print_ok
       end

data/lib/dust/recipes/repositories.rb

@@ -2,20 +2,20 @@ class Repositories < Thor
   desc 'repositories:deploy', 'configures package management repositories (aptitude, yum)'
   def deploy node, repos, options
 
-    if node.uses_apt?
+    if node.uses_apt? :quiet=>false
       :: Dust.print_msg 'deleting old repositories'
-      node.rm '/etc/apt/sources.list.d/*.list', true
+      node.rm '/etc/apt/sources.list.d/*.list', :quiet => true
       ::Dust.print_ok 
 
+      puts
       repos.each do |name, repo|
-        puts
 
         # if repo is present but not a hash use defaults
         repo = {} unless repo.is_a? Hash
 
         # setting defaults
-        repo['url'] ||= 'http://ftp.debian.org/debian/' if node.is_debian? true
-        repo['url'] ||= 'http://archive.ubuntu.com/ubuntu/' if node.is_ubuntu? true
+        repo['url'] ||= 'http://ftp.debian.org/debian/' if node.is_debian?
+        repo['url'] ||= 'http://archive.ubuntu.com/ubuntu/' if node.is_ubuntu?
    
         repo['release'] ||= node['lsbdistcodename']
         repo['components'] ||= 'main'
@@ -33,10 +33,10 @@ class Repositories < Thor
                      "deb-src #{repo['url']} #{repo['release']} #{repo['components']}\n\n"
 
           # security
-          if node.is_debian? true
+          if node.is_debian?
             sources += "deb http://security.debian.org/ #{repo['release']}/updates #{repo['components']}\n" +
                        "deb-src http://security.debian.org/ #{repo['release']}/updates #{repo['components']}\n\n"
-          elsif node.is_ubuntu? true
+          elsif node.is_ubuntu?
             sources += "deb http://security.ubuntu.com/ubuntu/ #{repo['release']}-security #{repo['components']}\n" +
                        "deb-src http://security.ubuntu.com/ubuntu/ #{repo['release']}-security #{repo['components']}\n\n"
           end
@@ -46,19 +46,18 @@ class Repositories < Thor
                      "deb-src #{repo['url']} #{repo['release']}-updates #{repo['components']}\n\n"
 
           # proposed
-          if node.is_ubuntu? true
+          if node.is_ubuntu?
             sources += "deb #{repo['url']} #{repo['release']}-proposed #{repo['components']}\n" +
                        "deb-src #{repo['url']} #{repo['release']}-proposed #{repo['components']}\n\n"
           end
 
           # backports is enabled per default in ubuntu oneiric
-          if node.is_ubuntu? true
+          if node.is_ubuntu?
             sources += "deb #{repo['url']} #{repo['release']}-backports #{repo['components']}\n" +
                        "deb-src #{repo['url']} #{repo['release']}-backports #{repo['components']}\n\n"
           end
 
-          ::Dust.print_result node.write('/etc/apt/sources.list', sources, true)
-          next
+          ::Dust.print_result node.write('/etc/apt/sources.list', sources, :quiet => true)
 
         else
           # add url to sources.list
@@ -67,7 +66,7 @@ class Repositories < Thor
           sources += "deb-src #{repo['url']} #{repo['release']} #{repo['components']}\n" if repo['source']
 
           ::Dust.print_msg "adding repository '#{name}' to sources"
-          ::Dust.print_result node.write("/etc/apt/sources.list.d/#{name}.list", sources, true)
+          ::Dust.print_result node.write("/etc/apt/sources.list.d/#{name}.list", sources, :quiet => true)
 
           # add the repository key
           if repo['key']
@@ -77,7 +76,7 @@ class Repositories < Thor
         end
       end
 
-    elsif node.uses_rpm?
+    elsif node.uses_rpm? :quiet=>false
       ::Dust.print_failed 'rpm not yet supported'
 
     else
@@ -86,7 +85,7 @@ class Repositories < Thor
 
     # fetch new stuff
     puts
-    node.update_repos
+    node.update_repos if options.restart? or options.reload?
   end
 end