dust-deploy 0.3.3 → 0.4.0

data/lib/dust/recipes/rc_local.rb

@@ -1,21 +1,21 @@
-class RcLocal < Thor
+class RcLocal < Recipe
   desc 'rc_local:deploy', 'configures custom startup script'
-  def deploy node, config, options
+  def deploy
 
-    if node.uses_apt?
+    if @node.uses_apt?
       ::Dust.print_msg "configuring custom startup script\n"
 
       rc = ''
-      config.each do |cmd|
+      @config.each do |cmd|
         ::Dust.print_msg "adding command: #{cmd}", :indent => 2
         rc += "#{cmd}\n"
         ::Dust.print_ok
       end
       rc += "\nexit 0\n"
 
-      node.write '/etc/rc.local', rc
-      node.chown 'root:root', '/etc/rc.local'
-      node.chmod '755', '/etc/rc.local'
+      @node.write '/etc/rc.local', rc
+      @node.chown 'root:root', '/etc/rc.local'
+      @node.chmod '755', '/etc/rc.local'
     else
       ::Dust.print_failed 'os not supported'
     end

data/lib/dust/recipes/remove_packages.rb

@@ -1,8 +1,8 @@
-class RemovePackages < Thor
+class RemovePackages < Recipe
   desc 'remove_packages:deploy', 'removes packages'
-  def deploy node, packages, options
-    packages.each do |package| 
-      node.remove_package package
+  def deploy
+    @config.each do |package| 
+      @node.remove_package package
     end
   end
 end

data/lib/dust/recipes/repositories.rb

@@ -1,24 +1,24 @@
-class Repositories < Thor
+class Repositories < Recipe
   desc 'repositories:deploy', 'configures package management repositories (aptitude, yum)'
-  def deploy node, repos, options
-    node.collect_facts
+  def deploy
+    @node.collect_facts
 
-    if node.uses_apt? :quiet=>false
+    if @node.uses_apt? :quiet=>false
       :: Dust.print_msg 'deleting old repositories'
-      node.rm '/etc/apt/sources.list.d/*.list', :quiet => true
+      @node.rm '/etc/apt/sources.list.d/*.list', :quiet => true
       ::Dust.print_ok 
 
       puts
-      repos.each do |name, repo|
+      @config.each do |name, repo|
 
         # 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?
-        repo['url'] ||= 'http://archive.ubuntu.com/ubuntu/' if node.is_ubuntu?
+        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['release'] ||= @node['lsbdistcodename']
         repo['components'] ||= 'main'
 
         # ||= doesn't work for booleans
@@ -34,10 +34,10 @@ class Repositories < Thor
                      "deb-src #{repo['url']} #{repo['release']} #{repo['components']}\n\n"
 
           # security
-          if node.is_debian?
+          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?
+          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
@@ -47,18 +47,18 @@ class Repositories < Thor
                      "deb-src #{repo['url']} #{repo['release']}-updates #{repo['components']}\n\n"
 
           # proposed
-          if node.is_ubuntu?
+          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?
+          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, :quiet => true)
+          ::Dust.print_result @node.write('/etc/apt/sources.list', sources, :quiet => true)
 
         else
           # add url to sources.list
@@ -67,17 +67,17 @@ 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, :quiet => true)
+          ::Dust.print_result @node.write("/etc/apt/sources.list.d/#{name}.list", sources, :quiet => true)
 
           # add the repository key
           if repo['key']
             ::Dust.print_msg "adding #{name} repository key"
-            ::Dust.print_result node.exec("wget -O- '#{repo['key']}' | apt-key add -")[:exit_code]
+            ::Dust.print_result @node.exec("wget -O- '#{repo['key']}' | apt-key add -")[:exit_code]
           end
         end
       end
 
-    elsif node.uses_rpm? :quiet=>false
+    elsif @node.uses_rpm? :quiet=>false
       ::Dust.print_failed 'rpm not yet supported'
 
     else
@@ -86,7 +86,7 @@ class Repositories < Thor
 
     # fetch new stuff
     puts
-    node.update_repos if options.restart? or options.reload?
+    @node.update_repos if options.restart? or options.reload?
   end
 end
 

data/lib/dust/recipes/resolv_conf.rb

@@ -1,42 +1,42 @@
-class ResolvConf < Thor
+class ResolvConf < Recipe
   desc 'resolv_conf:deploy', 'configures /etc/resolv.conf'
-  def deploy node, config, options
+  def deploy 
     ::Dust.print_msg "configuring resolv.conf\n"
 
     # if config is just true, create empty hash and use defaults
-    config = {} unless config.is_a? Hash
+    @config = {} unless @config.is_a? Hash
 
     # setting default config variables (unless already set)
-    config['nameservers'] ||= [ '208.67.222.222', '208.67.220.220' ] # opendns
+    @config['nameservers'] ||= [ '208.67.222.222', '208.67.220.220' ] # opendns
 
     config_file = ''
 
     # configures whether daily reports are sent
-    if config['search']
-      ::Dust.print_msg "adding search #{config['search']}", :indent => 2
-      config_file += "search #{config['search']}\n"
+    if @config['search']
+      ::Dust.print_msg "adding search #{@config['search']}", :indent => 2
+      config_file += "search #{@config['search']}\n"
       ::Dust.print_ok
     end
 
-    if config['domain']
-      ::Dust.print_msg "adding domain #{config['domain']}", :indent => 2
-      config_file += "domain #{config['domain']}\n"
+    if @config['domain']
+      ::Dust.print_msg "adding domain #{@config['domain']}", :indent => 2
+      config_file += "domain #{@config['domain']}\n"
       ::Dust.print_ok
     end
 
-    if config['options']
-      ::Dust.print_msg "adding options #{config['options']}", :indent => 2
-      config_file += "options #{config['options']}\n"
+    if @config['options']
+      ::Dust.print_msg "adding options #{@config['options']}", :indent => 2
+      config_file += "options #{@config['options']}\n"
       ::Dust.print_ok
     end
 
-    config['nameservers'].each do |nameserver|
+    @config['nameservers'].each do |nameserver|
       ::Dust.print_msg "adding nameserver #{nameserver}", :indent => 2
       config_file += "nameserver #{nameserver}\n"
       ::Dust.print_ok
     end
  
-    node.write '/etc/resolv.conf', config_file
+    @node.write '/etc/resolv.conf', config_file
   end
 end
 

data/lib/dust/recipes/ssh_authorized_keys.rb

@@ -1,15 +1,13 @@
 require 'yaml'
 
-class SshAuthorizedKeys < Thor
+class SshAuthorizedKeys < Recipe
   desc 'ssh_authorized_keys:deploy', 'configures ssh authorized_keys'
-  def deploy node, ingredients, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-
+  def deploy
     # load users and their ssh keys from yaml file
-    users = YAML.load_file "#{template_path}/users.yaml"
+    users = YAML.load_file "#{@template_path}/users.yaml"
 
     authorized_keys = {}
-    ingredients.each do |remote_user, ssh_users|
+    @config.each do |remote_user, ssh_users|
       ::Dust.print_msg "generating authorized_keys for #{remote_user}\n"
       authorized_keys = ''
 
@@ -28,27 +26,27 @@ class SshAuthorizedKeys < Thor
       end
 
       # create user, if not existent
-      next unless node.create_user remote_user
+      next unless @node.create_user remote_user
 
       # check and create necessary directories
-      next unless node.mkdir("~#{remote_user}/.ssh")
+      next unless @node.mkdir("~#{remote_user}/.ssh")
 
       # deploy authorized_keys
-      next unless node.write "~#{remote_user}/.ssh/authorized_keys", authorized_keys
+      next unless @node.write "~#{remote_user}/.ssh/authorized_keys", authorized_keys
 
       # check permissions
-      node.chown "#{remote_user}:#{remote_user}", "~#{remote_user}/.ssh"
-      node.chmod '0644', "~#{remote_user}/.ssh/authorized_keys"
+      @node.chown "#{remote_user}:#{remote_user}", "~#{remote_user}/.ssh"
+      @node.chmod '0644', "~#{remote_user}/.ssh/authorized_keys"
 
 
       # TODO: add this option
       # remove authorized_keys files for all other users
       if options.cleanup?
         ::Dust.print_msg "deleting other authorized_keys files\n"
-        node.get_system_users(:quiet => true).each do |user|
+        @node.get_system_users(:quiet => true).each do |user|
           next if users.keys.include? user
-          if node.file_exists? "~#{user}/.ssh/authorized_keys", :quiet => true
-            node.rm "~#{user}/.ssh/authorized_keys", :indent => 2
+          if @node.file_exists? "~#{user}/.ssh/authorized_keys", :quiet => true
+            @node.rm "~#{user}/.ssh/authorized_keys", :indent => 2
            end
         end
       end

data/lib/dust/recipes/unattended_upgrades.rb

@@ -1,29 +1,27 @@
-class UnattendedUpgrades < Thor
+class UnattendedUpgrades < Recipe
   desc 'unattended_upgrades:deploy', 'installs and configures automatic system updates for debian and ubuntu'
-  def deploy node, config, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
+  def deploy
+    return unless @node.uses_apt? 
+    @node.install_package 'unattended-upgrades'
 
-    return unless node.uses_apt? 
-    node.install_package 'unattended-upgrades'
-
-    config = {} unless config.is_a? Hash
+    @config = {} unless @config.is_a? Hash
 
     # set defaults for non-set config
-    config['enable'] ||= 1
-    config['update-package-lists'] ||= 1
-    config['unattended-upgrade'] ||= 1
-    config['autocleaninterval'] ||= 1
-    config['verbose'] ||= 0
+    @config['enable'] ||= 1
+    @config['update-package-lists'] ||= 1
+    @config['unattended-upgrade'] ||= 1
+    @config['autocleaninterval'] ||= 1
+    @config['verbose'] ||= 0
 
     # generate configuration file
     periodic = ''
-    periodic += "APT::Periodic::Enable \"#{config['enable']}\";\n"
-    periodic += "APT::Periodic::Update-Package-Lists \"#{config['update-package-lists']}\";\n"
-    periodic += "APT::Periodic::Unattended-Upgrade \"#{config['unattended-upgrade']}\";\n"
-    periodic += "APT::Periodic::AutocleanInterval \"#{config['autocleaninterval']}\";\n"
-    periodic += "APT::Periodic::Verbose \"#{config['verbose']}\";\n"
+    periodic += "APT::Periodic::Enable \"#{@config['enable']}\";\n"
+    periodic += "APT::Periodic::Update-Package-Lists \"#{@config['update-package-lists']}\";\n"
+    periodic += "APT::Periodic::Unattended-Upgrade \"#{@config['unattended-upgrade']}\";\n"
+    periodic += "APT::Periodic::AutocleanInterval \"#{@config['autocleaninterval']}\";\n"
+    periodic += "APT::Periodic::Verbose \"#{@config['verbose']}\";\n"
 
-    node.write '/etc/apt/apt.conf.d/02periodic', periodic      
+    @node.write '/etc/apt/apt.conf.d/02periodic', periodic      
   end
 end
 

data/lib/dust/recipes/zabbix_agent.rb

@@ -1,46 +1,44 @@
 require 'erb'
 
-class ZabbixAgent < Thor
+class ZabbixAgent < Recipe
   desc 'zabbix_agent:deploy', 'installs and configures zabbix agent'
-  def deploy node, ingredients, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
+  def deploy 
+    return unless install_zabbix
 
-    return unless install_zabbix node
-
-    # configure node using erb template
-    template = ERB.new File.read("#{template_path}/zabbix_agentd.conf.erb"), nil, '%<>'
+    # configure @node using erb template
+    template = ERB.new File.read("#{@template_path}/zabbix_agentd.conf.erb"), nil, '%<>'
     ::Dust.print_msg 'adjusting and deploying zabbix_agentd.conf'
-    node.write '/etc/zabbix/zabbix_agentd.conf', template.result(binding), :quiet => true
+    @node.write '/etc/zabbix/zabbix_agentd.conf', template.result(binding), :quiet => true
     ::Dust.print_ok
 
     # restart using new configuration
-    if node.uses_emerge? :quiet => true
-      node.autostart_service 'zabbix-agentd'
-      node.restart_service 'zabbix-agentd' if options.restart?
+    if @node.uses_emerge? :quiet => true
+      @node.autostart_service 'zabbix-agentd'
+      @node.restart_service 'zabbix-agentd' if options.restart?
     else 
-      node.autostart_service 'zabbix-agent'
-      node.restart_service 'zabbix-agent' if options.restart?
+      @node.autostart_service 'zabbix-agent'
+      @node.restart_service 'zabbix-agent' if options.restart?
     end
   end
 
   private
   # installs zabbix and its dependencies
-  def install_zabbix node
+  def install_zabbix
 
-    if node.uses_apt?
-      return false unless node.install_package 'zabbix-agent'
+    if @node.uses_apt?
+      return false unless @node.install_package 'zabbix-agent'
 
       # debsecan is needed for zabbix checks (security updates)
-      return false unless node.install_package 'debsecan'
+      return false unless @node.install_package 'debsecan'
 
-    elsif node.uses_emerge?
-      return false unless node.install_package 'zabbix', :env => 'USE=agent'
+    elsif @node.uses_emerge?
+      return false unless @node.install_package 'zabbix', :env => 'USE=agent'
 
       # glsa-check (part of gentoolkit) is needed for zabbix checks (security updates)
-      return false unless node.install_package 'gentoolkit'
+      return false unless @node.install_package 'gentoolkit'
 
-    elsif node.uses_rpm?
-      return false unless node.install_package 'zabbix-agent'
+    elsif @node.uses_rpm?
+      return false unless @node.install_package 'zabbix-agent'
 
     else
       ::Dust.print_msg 'os not supported'
@@ -53,32 +51,32 @@ class ZabbixAgent < Thor
 
   # TODO (not yet finished)
   desc 'zabbix_agent:postgres', 'configure postgres database for zabbix monitoring'
-  def postgres node, ingredients, options
-    next unless node.uses_emerge? :quiet=>false
-    next unless node.package_installed?('postgresql-node')
+  def postgres
+    next unless @node.uses_emerge? :quiet=>false
+    next unless @node.package_installed?('postgresql-@node')
 
     ::Dust.print_msg 'add zabbix system user to postgres group'
-    ::Dust.print_result( node.exec('usermod -a -G postgres zabbix')[:exit_code] )
+    ::Dust.print_result( @node.exec('usermod -a -G postgres zabbix')[:exit_code] )
 
     ::Dust.print_msg 'checking if zabbix user exists in postgres'
-    ret = ::Dust.print_result( node.exec('psql -U postgres -c ' +
+    ret = ::Dust.print_result( @node.exec('psql -U postgres -c ' +
                                        '  "SELECT usename FROM pg_user WHERE usename = \'zabbix\'"' +
                                        '  postgres |grep -q zabbix')[:exit_code] )
 
     # if user was not found, create him
     unless ret
       ::Dust.print_msg 'create zabbix user in postgres', :indent => 2
-      ::Dust.print_result( node.exec('createuser -U postgres zabbix -RSD')[:exit_code] )
+      ::Dust.print_result( @node.exec('createuser -U postgres zabbix -RSD')[:exit_code] )
     end
 
 # TODO: only GRANT is this is a master
     ::Dust.print_msg 'GRANT zabbix user access to postgres database'
-    ::Dust.print_result( node.exec('psql -U postgres -c "GRANT SELECT ON pg_stat_database TO zabbix" postgres')[:exit_code] )
+    ::Dust.print_result( @node.exec('psql -U postgres -c "GRANT SELECT ON pg_stat_database TO zabbix" postgres')[:exit_code] )
 
     # reload postgresql
-    node.reload_service('postgresql-9.0')
+    @node.reload_service('postgresql-9.0')
 
-    node.disconnect
+    @node.disconnect
     puts
   end
 end

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - kris kechagia
@@ -124,6 +124,7 @@ files:
 - lib/dust/examples/templates/zabbix_agent/zabbix_agentd.conf.erb
 - lib/dust/helper.rb
 - lib/dust/print_status.rb
+- lib/dust/recipe.rb
 - lib/dust/recipes/aliases.rb
 - lib/dust/recipes/basic_setup.rb
 - lib/dust/recipes/debsecan.rb