dust-deploy 0.3.3 → 0.4.0

data/lib/dust/recipes/duplicity.rb

@@ -1,23 +1,20 @@
 require 'erb'
 
-class Duplicity < Thor
+class Duplicity < Recipe
   desc 'duplicity:deploy', 'installs and configures duplicity backups'
-  def deploy node, scenarios, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-
-    return unless node.install_package 'duplicity'
+  def deploy
+    return unless @node.install_package 'duplicity'
 
     # clear all other duplicity cronjobs that might have been deployed earlier
-    remove_duplicity_cronjobs node
+    remove_duplicity_cronjobs
 
     # return if config simply says 'remove'
-    return if scenarios == 'remove'
+    return if @config == 'remove'
 
-    scenarios.each do |scenario, conf|
-      config = conf.clone
+    @config.each do |scenario, config|
 
       # if directory config options is not given, use hostname-scenario
-      config['directory'] ||= "#{node['hostname']}-#{scenario}"
+      config['directory'] ||= "#{@node['hostname']}-#{scenario}"
 
       # check whether backend is specified, skip to next scenario if not
       unless config['backend'] and config['passphrase']
@@ -31,17 +28,17 @@ class Duplicity < Thor
       end
 
       # check whether we need ncftp
-      node.install_package 'ncftp' if config['backend'].include? 'ftp://'
+      @node.install_package 'ncftp' if config['backend'].include? 'ftp://'
       
       # 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?
+      # @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', :indent => 2
-          node.append '~/.ssh/known_hosts', config['hostkey'], :indent => 2
+        unless ::Dust.print_result @node.exec("grep -q '#{config['hostkey']}' ~/.ssh/known_hosts")[:exit_code] == 0
+          @node.mkdir '~/.ssh', :indent => 2
+          @node.append '~/.ssh/known_hosts', config['hostkey'], :indent => 2
         end
       end
 
@@ -49,13 +46,13 @@ class Duplicity < Thor
       cronjob_path = "/etc/cron.#{config['interval']}/duplicity-#{scenario}"
 
       # adjust and upload cronjob
-      template = ERB.new File.read("#{template_path}/cronjob.erb"), nil, '%<>'
+      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}", :indent => 2 }
-      node.write cronjob_path, template.result(binding)
+      @node.write cronjob_path, template.result(binding)
  
       # making cronjob executeable
-      node.chmod '0700', cronjob_path
+      @node.chmod '0700', cronjob_path
       puts
     end
   end
@@ -63,16 +60,14 @@ class Duplicity < Thor
 
   # print duplicity-status
   desc 'duplicity:status', 'displays current status of all duplicity backups'
-  def status node, scenarios, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-
-    return unless node.package_installed? 'duplicity'
+  def status
+    return unless @node.package_installed? 'duplicity'
 
-    scenarios.each do |scenario, conf|
+    @config.each do |scenario, conf|
       config = conf.clone
 
       # if directory config option is not given, use hostname-scenario
-      config['directory'] ||= "#{node['hostname']}-#{scenario}"
+      config['directory'] ||= "#{@node['hostname']}-#{scenario}"
 
       # check whether backend is specified, skip to next scenario if not
       return ::Dust.print_failed 'no backend specified.' unless config['backend']
@@ -84,7 +79,7 @@ class Duplicity < Thor
   
       cmd += " |tail -n3 |head -n1" unless options.long?
 
-      ret = node.exec cmd
+      ret = @node.exec cmd
 
       # check exit code and stdout shouldn't be empty
       ::Dust.print_result( (ret[:exit_code] == 0 and ret[:stdout].length > 0) )
@@ -101,9 +96,9 @@ class Duplicity < Thor
 
   private
   # removes all duplicity cronjobs
-  def remove_duplicity_cronjobs node
+  def remove_duplicity_cronjobs
     ::Dust.print_msg 'deleting old duplicity cronjobs'
-    node.rm '/etc/cron.*/duplicity*', :quiet => true
+    @node.rm '/etc/cron.*/duplicity*', :quiet => true
     ::Dust.print_ok
   end
 

data/lib/dust/recipes/etc_hosts.rb

@@ -1,14 +1,12 @@
-class EtcHosts < Thor
+class EtcHosts < Recipe
   desc 'etc_hosts:deploy', 'deploys /etc/hosts'
-  def deploy node, daemon, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-
-    node.scp "#{template_path}/hosts", '/etc/hosts'
+  def deploy
+    @node.scp "#{@template_path}/hosts", '/etc/hosts'
 
     # restart dns service
-    if options.restart? and daemon.is_a? String
-      node.package_installed? daemon
-      node.restart_service daemon if options.restart?
+    if @options.restart? and @config.is_a? String
+      @node.package_installed? @config
+      @node.restart_service @config
     end
   end
 end

data/lib/dust/recipes/iptables.rb

@@ -1,14 +1,9 @@
 require 'ipaddress'
 
-class Iptables < Thor
+class Iptables < Recipe
   
   desc 'iptables:deploy', 'configures iptables firewall'
-  def deploy node, rules, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-    @node = node
-    @rules = rules
-    @options = options
-
+  def deploy
     # list of all tables and chains
     @tables = {}
     @tables['ipv4'] = {}
@@ -69,7 +64,7 @@ class Iptables < Thor
   # protocol to tcp (if port is given)
   # and converts non-arrays to arrays, so .each and .combine won't cause hickups
   def populate_rule_defaults
-    @rules.values.each do |chain_rules|
+    @config.values.each do |chain_rules|
       chain_rules.values.each do |rule|
         rule['table'] ||= ['filter']
         rule['jump'] ||= ['ACCEPT']
@@ -113,9 +108,9 @@ class Iptables < Thor
   def get_chain_policy table, chain
     # only filter table supports DENY target
     return 'ACCEPT' unless table == 'filter'
-    return 'ACCEPT' unless @rules[chain.downcase]
+    return 'ACCEPT' unless @config[chain.downcase]
 
-    @rules[chain.downcase].values.each do |rule|
+    @config[chain.downcase].values.each do |rule|
       return 'DROP' if rule['table'].include? table
     end
 
@@ -124,7 +119,7 @@ class Iptables < Thor
 
   # generate iptables rules for table 'table'
   def generate_rules_for_table table
-    @rules.each do |chain, chain_rules|
+    @config.each do |chain, chain_rules|
       rules = get_rules_for_table chain_rules, table
       next if rules.empty?
       

data/lib/dust/recipes/locale.rb

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

data/lib/dust/recipes/memory_limit.rb

@@ -1,12 +1,11 @@
-class MemoryLimit < Thor
-  desc 'memory_limit:deploy', 'sets up system wide memory limit per process'
-  def deploy node, ingredients, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
+class MemoryLimit < Recipe
 
-    node.collect_facts
+  desc 'memory_limit:deploy', 'sets up system wide memory limit per process'
+  def deploy
+    @node.collect_facts
 
     # get system memory (in kb)
-    system_mem = ::Dust.convert_size node['memorysize']
+    system_mem = ::Dust.convert_size @node['memorysize']
 
     # don't allow a process to use more than 90% of the system memory
     max_mem = (system_mem * 0.9).to_i
@@ -16,8 +15,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}", :quiet => true
+    @node.write '/etc/security/limits.d/00-memory-limit', "*          hard    as        #{max_mem}", :quiet => true
     ::Dust.print_ok
-
   end
 end

data/lib/dust/recipes/motd.rb

@@ -1,12 +1,10 @@
 require 'erb'
 
-class Motd < Thor
+class Motd < Recipe
   desc 'motd:deploy', 'creates message of the day'
-  def deploy node, ingredients, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-
+  def deploy
     # configure node using erb template
-    template = ERB.new File.read("#{template_path}/motd.erb"), nil, '%<>'
-    node.write '/etc/motd', template.result(binding)
+    template = ERB.new File.read("#{@template_path}/motd.erb"), nil, '%<>'
+    @node.write '/etc/motd', template.result(binding)
   end
 end

data/lib/dust/recipes/mysql.rb

@@ -1,49 +1,47 @@
 require 'erb'
 
-class Mysql < Thor
+class Mysql < Recipe
   desc 'mysql:deploy', 'installs and configures mysql database'
-  def deploy node, config, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-
-    return unless node.uses_apt? :quiet=>false
-    node.install_package 'mysql-server'
+  def deploy
+    return unless @node.uses_apt? :quiet=>false
+    @node.install_package 'mysql-server'
 
     ::Dust.print_msg "configuring mysql\n"
 
     # defaults
-    config['bind_address'] ||= '127.0.0.1'
-    config['port'] ||= 3306
+    @config['bind_address'] ||= '127.0.0.1'
+    @config['port'] ||= 3306
 
-    ::Dust.print_ok "listen on #{config['bind_address']}:#{config['port']}", :indent => 2
+    ::Dust.print_ok "listen on #{@config['bind_address']}:#{@config['port']}", :indent => 2
 
-    config['innodb_file_per_table'] ||= 1
-    config['innodb_thread_concurrency'] ||= 0
-    config['innodb_flush_log_at_trx_commit'] ||= 1
+    @config['innodb_file_per_table'] ||= 1
+    @config['innodb_thread_concurrency'] ||= 0
+    @config['innodb_flush_log_at_trx_commit'] ||= 1
 
     # allocate 70% of the available ram to mysql
     # but leave max 1gb to system
-    unless config['innodb_buffer_pool_size']
+    unless @config['innodb_buffer_pool_size']
       ::Dust.print_msg 'autoconfiguring innodb buffer size', :indent => 2
-      node.collect_facts :quiet => true
+      @node.collect_facts :quiet => true
 
       # get system memory (in kb)
-      system_mem = ::Dust.convert_size node['memorysize']
+      system_mem = ::Dust.convert_size @node['memorysize']
 
       # allocate 70% of the available ram to mysql
       buffer_pool = (system_mem * 0.70).to_i / 1024
 
-      config['innodb_buffer_pool_size'] = "#{buffer_pool}M"
+      @config['innodb_buffer_pool_size'] = "#{buffer_pool}M"
       ::Dust.print_ok
     end
 
-    ::Dust.print_ok "setting innodb buffer pool to '#{config['innodb_buffer_pool_size']}'", :indent => 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)
-    node.chmod '644', '/etc/mysql/my.cnf'
+    template = ERB.new( File.read("#{@template_path}/my.cnf.erb"), nil, '%<>')
+    @node.write '/etc/mysql/my.cnf', template.result(binding)
+    @node.chmod '644', '/etc/mysql/my.cnf'
 
-    node.service_restart 'mysql-server' if options.restart?
-    node.service_reload 'mysql-server' if options.reload?
+    @node.restart_service 'mysql-server' if options.restart?
+    @node.reload_service 'mysql-server' if options.reload?
   end
 end
 

data/lib/dust/recipes/newrelic.rb

@@ -1,20 +1,20 @@
-class Newrelic < Thor
+class Newrelic < Recipe
   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? :quiet=>false
+  def deploy 
+    return Dust.print_failed 'no key specified' unless @config
+    return unless @node.uses_apt? :quiet=>false
 
     ::Dust.print_msg 'updating repositories'
-    ::Dust.print_result node.exec('aptitude update')[:exit_code]
+    ::Dust.print_result @node.exec('aptitude update')[:exit_code]
 
-    unless node.install_package 'newrelic-sysmond'
+    unless @node.install_package 'newrelic-sysmond'
       ::Dust.print_failed 'installing newrelic monitoring daemon failed, did you setup the newrelic repositories?'
       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=#{key}")[:exit_code]
+    return unless ::Dust.print_result @node.exec("nrsysmond-config --set ssl=true license_key=#{@config}")[:exit_code]
 
-    node.restart_service 'newrelic-sysmond' if options.restart?
+    @node.restart_service 'newrelic-sysmond' if options.restart?
   end
 end

data/lib/dust/recipes/nginx.rb

@@ -1,31 +1,29 @@
 require 'erb'
 
-class Nginx < Thor
+class Nginx < Recipe
   desc 'nginx:deploy', 'installs and configures nginx web server'
-  def deploy node, sites, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-
+  def deploy
     # abort if nginx cannot be installed
-    return unless node.install_package('nginx')
+    return unless @node.install_package('nginx')
 
-    node.scp("#{template_path}/nginx.conf", '/etc/nginx/nginx.conf')
+    @node.scp("#{@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-*'
-    node.rm '/etc/nginx/sites-*/*', :quiet => true
+    @node.rm '/etc/nginx/sites-*/*', :quiet => true
     ::Dust.print_ok
 
-    sites.each do |state, site|
-      file = "#{template_path}/sites/#{site}"
+    @config.each do |state, site|
+      file = "#{@template_path}/sites/#{site}"
 
       # if this site is just a regular file, copy it to sites-available
       if File.exists? file
-        node.scp file, "/etc/nginx/sites-available/#{site}"
+        @node.scp file, "/etc/nginx/sites-available/#{site}"
 
        # if this site is an erb template, render it and deploy
       elsif File.exists? "#{file}.erb"
         template = ERB.new( File.read("#{file}.erb"), nil, '%<>')
-        node.write "/etc/nginx/sites-available/#{site}", template.result(binding)
+        @node.write "/etc/nginx/sites-available/#{site}", template.result(binding)
 
       # skip to next site if template wasn't found
       else
@@ -36,15 +34,15 @@ class Nginx < Thor
       # 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] )
+        ::Dust.print_result( @node.exec("cd /etc/nginx/sites-enabled && ln -s ../sites-available/#{site} #{site}")[:exit_code] )
       end
     end
 
     # check configuration and restart nginx
     ::Dust.print_msg 'checking nginx configuration'
-    if node.exec('/etc/init.d/nginx configtest')[:exit_code] == 0
+    if @node.exec('/etc/init.d/nginx configtest')[:exit_code] == 0
       ::Dust.print_ok
-      node.restart_service('nginx') if options.restart?
+      @node.restart_service('nginx') if options.restart?
     else
       ::Dust.print_failed
     end

data/lib/dust/recipes/packages.rb

@@ -1,8 +1,8 @@
-class Packages < Thor
+class Packages < Recipe
   desc 'packages:deploy', 'installs packages'
-  def deploy node, packages, options
-    packages.each do |package| 
-      node.install_package package
+  def deploy 
+    @config.each do |package| 
+      @node.install_package package
     end
   end
 end

data/lib/dust/recipes/postgres.rb

@@ -1,83 +1,81 @@
 require 'erb'
 
-class Postgres < Thor
+class Postgres < Recipe
   desc 'postgres:deploy', 'installs and configures postgresql database'
-  def deploy node, config, options
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-
-    return ::Dust.print_failed 'no version specified' unless config['version']
-
-    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?
-      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'
+  def deploy
+    return ::Dust.print_failed 'no version specified' unless @config['version']
+
+    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?
+      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
 
 
-    deploy_file 'postgresql.conf', "#{config['conf-dir']}/postgresql.conf", binding
-    deploy_file 'pg_hba.conf', "#{config['conf-dir']}/pg_hba.conf", binding
-    deploy_file 'pg_ident.conf', "#{config['conf-dir']}/pg_ident.conf", binding
+    deploy_file 'postgresql.conf', "#{@config['conf-dir']}/postgresql.conf"
+    deploy_file 'pg_hba.conf', "#{@config['conf-dir']}/pg_hba.conf"
+    deploy_file 'pg_ident.conf', "#{@config['conf-dir']}/pg_ident.conf"
 
-    node.chmod '644', "#{config['conf-dir']}/postgresql.conf"
-    node.chmod '644', "#{config['conf-dir']}/pg_hba.conf"
-    node.chmod '644', "#{config['conf-dir']}/pg_ident.conf"
+    @node.chmod '644', "#{@config['conf-dir']}/postgresql.conf"
+    @node.chmod '644', "#{@config['conf-dir']}/pg_hba.conf"
+    @node.chmod '644', "#{@config['conf-dir']}/pg_ident.conf"
 
     # deploy pacemaker script
-    if node.package_installed? 'pacemaker'
-      deploy_file 'pacemaker.sh', "#{config['conf-dir']}/pacemaker.sh", binding
-      node.chmod '755', "#{config['conf-dir']}/pacemaker.sh"
+    if @node.package_installed? 'pacemaker'
+      deploy_file 'pacemaker.sh', "#{@config['conf-dir']}/pacemaker.sh"
+      @node.chmod '755', "#{@config['conf-dir']}/pacemaker.sh"
     end
 
     # 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", :quiet => true
-      deploy_file 'recovery.conf', "#{config['data-dir']}/recovery.conf", binding
+    if @node.file_exists? "#{@config['data-dir']}/recovery.conf", :quiet => true
+      deploy_file 'recovery.conf', "#{@config['data-dir']}/recovery.conf"
     else
-      deploy_file 'recovery.conf', "#{config['data-dir']}/recovery.done", binding
+      deploy_file 'recovery.conf', "#{@config['data-dir']}/recovery.done"
     end
 
     # deploy certificates to data-dir
-    deploy_file 'server.crt', "#{config['data-dir']}/server.crt", binding
-    deploy_file 'server.key', "#{config['data-dir']}/server.key", binding
+    deploy_file 'server.crt', "#{@config['data-dir']}/server.crt"
+    deploy_file 'server.key', "#{@config['data-dir']}/server.key"
 
-    node.chown config['dbuser'], config['data-dir'] if config['dbuser']
-    node.chmod 'u+Xrw,g-rwx,o-rwx', config['data-dir']
+    @node.chown @config['dbuser'], @config['data-dir'] if @config['dbuser']
+    @node.chmod 'u+Xrw,g-rwx,o-rwx', @config['data-dir']
 
     # create archive dir
-    node.mkdir config['archive-dir']
-    node.chown config['dbuser'], config['archive-dir'] if config['dbuser']
-    node.chmod 'u+Xrw,g-rwx,o-rwx', config['archive-dir']
+    @node.mkdir @config['archive-dir']
+    @node.chown @config['dbuser'], @config['archive-dir'] if @config['dbuser']
+    @node.chmod 'u+Xrw,g-rwx,o-rwx', @config['archive-dir']
 
 
     # increase shm memory
-    if node.uses_apt?
+    if @node.uses_apt?
       ::Dust.print_msg "setting postgres sysctl keys\n"
-      node.collect_facts :quiet => true
+      @node.collect_facts :quiet => true
 
       # use half of system memory for shmmax
-      shmmax = ::Dust.convert_size(node['memorysize']) * 1024 / 2
+      shmmax = ::Dust.convert_size(@node['memorysize']) * 1024 / 2
       shmall = shmmax / 4096 # shmmax/pagesize (pagesize = 4096)
 
       ::Dust.print_msg "setting shmmax to: #{shmmax}", :indent => 2
-      ::Dust.print_result node.exec("sysctl -w kernel.shmmax=#{shmmax}")[:exit_code]
+      ::Dust.print_result @node.exec("sysctl -w kernel.shmmax=#{shmmax}")[:exit_code]
       ::Dust.print_msg "setting shmall to: #{shmall}", :indent => 2
-      ::Dust.print_result node.exec("sysctl -w kernel.shmall=#{shmall}")[:exit_code]
+      ::Dust.print_result @node.exec("sysctl -w kernel.shmall=#{shmall}")[:exit_code]
       ::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_result @node.exec('sysctl -w vm.overcommit_memory=2')[:exit_code]
       ::Dust.print_msg 'setting swappiness to 0', :indent => 2
-      ::Dust.print_result node.exec('sysctl -w vm.swappiness=0')[:exit_code]
+      ::Dust.print_result @node.exec('sysctl -w vm.swappiness=0')[:exit_code]
 
       file = ''
       file += "kernel.shmmax=#{shmmax}\n"
@@ -85,35 +83,29 @@ class Postgres < Thor
       file += "vm.overcommit_memory=2\n" # don't allocate memory that's not there
       file += "vm.swappiness=0\n" # rather shrink cache then use swap as filesystem cache
 
-      node.write "/etc/sysctl.d/30-postgresql-shm.conf", file
+      @node.write "/etc/sysctl.d/30-postgresql-shm.conf", file
     end
 
     # reload/restart postgres if command line option is given
-    node.restart_service config['service-name'] if options.restart?
-    node.reload_service config['service-name'] if options.reload?
+    @node.restart_service @config['service-name'] if options.restart?
+    @node.reload_service @config['service-name'] if options.reload?
   end
 
   private
-  def deploy_file file, target, recipe_binding
-    template_path = "./templates/#{ File.basename(__FILE__).chomp( File.extname(__FILE__) ) }"
-
-    # get node and config from binding
-    node = eval 'node', recipe_binding
-    config = eval 'config', recipe_binding
-
+  def deploy_file file, target
     # if file is just a regular file, copy it to sites-available
-    if File.exists? "#{template_path}/#{file}"
-      node.scp "#{template_path}/#{file}", target
+    if File.exists? "#{@template_path}/#{file}"
+      @node.scp "#{@template_path}/#{file}", target
 
     # if file is an erb template, render it and deploy
-    elsif File.exists? "#{template_path}/#{file}.erb"
+    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), :quiet => true)
+      template = ERB.new( File.read("#{@template_path}/#{file}.erb"), nil, '%<>')
+      ::Dust.print_result @node.write(target, template.result(binding), :quiet => true)
 
     # file was not found, return
     else
-      return ::Dust.print_failed "file '#{template_path}/#{file}' not found."
+      return ::Dust.print_failed "file '#{@template_path}/#{file}' not found."
     end
   end