dust-deploy 0.4.5 → 0.5.0

data/changelog.md

@@ -1,6 +1,26 @@
 Changelog
 =============
 
+0.5.0
+------------
+
+-  improved mysql recipe. it now accepts every option (change your configuration accordingly)
+
+    recipes:
+      mysql:
+        mysqld:
+          bind-address: 0.0.0.0
+          port: 1234
+        mysqldump:
+          quick: false
+        isamchk:
+          key_buffer: 128M
+
+-  fixes a bug in the ssh_authorized_keys recipe with ~user shortcut, uses new get_home method now
+-  fixes a bug in the duplicity recipe occuring when using yaml files with multiple hostnames
+-  fixes a bug where @node.get_home was returning nil
+
+
 0.4.5
 ------------
 

data/lib/dust/recipes/basic_setup.rb

@@ -4,7 +4,7 @@ class BasicSetup < Recipe
     # install some basic packages
     ::Dust.print_msg "installing basic packages\n"
 
-    @node.install_package 'screen', :indent => 2
+    @node.install_package 'tmux', :indent => 2
     @node.install_package 'rsync', :indent => 2
     @node.install_package 'psmisc', :indent => 2 if @node.uses_apt?
 

data/lib/dust/recipes/duplicity.rb

@@ -8,9 +8,11 @@ class Duplicity < Recipe
 
     # return if config simply says 'remove'
     return if @config == 'remove'
-
-    @config.each do |scenario, config|
-
+    
+    @config.each do |scenario, c|
+      # cloning is necessary if we have configurations with multiple hostnames
+      config = c.clone
+      
       # if directory config options is not given, use hostname-scenario
       config['directory'] ||= "#{@node['hostname']}-#{scenario}"
 
@@ -36,7 +38,7 @@ class Duplicity < Recipe
         ::Dust.print_msg 'checking if ssh key is in known_hosts'
         unless ::Dust.print_result @node.exec("grep -q '#{config['hostkey']}' /root/.ssh/known_hosts")[:exit_code] == 0
           @node.mkdir '/root/.ssh', :indent => 2
-          @node.append '/root/.ssh/known_hosts', config['hostkey'], :indent => 2
+          @node.append '/root/.ssh/known_hosts', "#{config['hostkey']}\n", :indent => 2
         end
       end
 

data/lib/dust/recipes/mysql.rb

@@ -4,41 +4,98 @@ class Mysql < Recipe
     return unless @node.uses_apt? :quiet=>false
     @node.install_package 'mysql-server'
 
+    @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
 
-    # defaults
-    @config['bind_address'] ||= '127.0.0.1'
-    @config['port'] ||= 3306
+    @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
 
-    ::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
+    @node.write '/etc/mysql/my.cnf', generate_my_cnf
+    @node.chmod '644', '/etc/mysql/my.cnf'
 
+    @node.restart_service 'mysql' if options.restart?
+    @node.reload_service 'mysql' if options.reload?
+  end
+  
+  
+  private
+  
+  def default_config
+    { 'client' => {
+        'port' => 3306,
+        'socket' => '/var/run/mysqld/mysqld.sock'
+      },
+      'mysqld_safe' => {
+        'socket' => '/var/run/mysqld/mysqld.sock',
+        'nice' => 0
+      },
+      'mysqld' => {
+        'bind-address' => '127.0.0.1',
+        'port' => 3306,
+        'user' => 'mysql',
+        'pid-file' => '/var/run/mysqld/mysqld.pid',
+        'socket' => '/var/run/mysqld/mysqld.sock',
+        'language' => '/usr/share/mysql/english',        
+        'basedir' => '/usr',
+        'datadir' => '/var/lib/mysql',
+        'tmpdir' => '/tmp',
+        'skip-external-locking' => true,
+        'key_buffer' => '16M',
+        'max_allowed_packet' => '16M',
+        'thread_stack' => '192K',
+        'thread_cache_size' => 8,
+        'myisam-recover' => 'BACKUP',
+        'query_cache_limit' => '1M',
+        'query_cache_size' => '16M',
+        'expire_logs_days' => 10,
+        'max_binlog_size' => '100M',
+        'innodb_file_per_table' => 1,
+        'innodb_thread_concurrency' => 0,
+        'innodb_flush_log_at_trx_commit' => 1
+      },
+      'mysqldump' => {
+        'quick' => true,
+        'quote-names' => true,
+        'max_allowed_packet' => '16M'
+      },
+      'mysql' => {},
+      'isamchk' => {
+        'key_buffer' => '16M',
+      }
+    }
+  end
+  
+  def get_innodb_buffer_pool_size
     # allocate 70% of the available ram to mysql
     # but leave max 1gb to system
-    unless @config['innodb_buffer_pool_size']
+    unless @config['mysqld']['innodb_buffer_pool_size']
       ::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']
-
+  
       # 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"
+     
       ::Dust.print_ok
+      "#{buffer_pool}M"
     end
-
-    ::Dust.print_ok "setting innodb buffer pool to '#{@config['innodb_buffer_pool_size']}'", :indent => 2
-
-    @node.deploy_file "#{@template_path}/my.cnf", '/etc/mysql/my.cnf', :binding => binding
-    @node.chmod '644', '/etc/mysql/my.cnf'
-
-    @node.restart_service 'mysql-server' if options.restart?
-    @node.reload_service 'mysql-server' if options.reload?
+  end
+  
+  def generate_my_cnf
+    my_cnf = ''
+    @config.each do |category, config|
+      my_cnf.concat "[#{category}]\n"
+      config.each { |key, value| my_cnf.concat "#{key} = #{value}\n" }
+      my_cnf.concat "\n"
+    end
+    
+    # add includedir
+    my_cnf.concat "!includedir /etc/mysql/conf.d/\n"
+    my_cnf
   end
 end
 

data/lib/dust/recipes/ssh_authorized_keys.rb

@@ -42,15 +42,16 @@ class SshAuthorizedKeys < Recipe
     # create user, if not existent
     next unless @node.create_user user
     
+    home = @node.get_home user
     # check and create necessary directories
-    next unless @node.mkdir("~#{user}/.ssh")
+    next unless @node.mkdir("#{home}/.ssh")
     
     # deploy authorized_keys
-    next unless @node.write "~#{user}/.ssh/authorized_keys", authorized_keys
+    next unless @node.write "#{home}/.ssh/authorized_keys", authorized_keys
     
     # check permissions
-    @node.chown "#{user}:#{user}", "~#{user}/.ssh"
-    @node.chmod '0644', "~#{user}/.ssh/authorized_keys"    
+    @node.chown "#{user}:#{user}", "#{home}/.ssh"
+    @node.chmod '0644', "#{home}/.ssh/authorized_keys"    
   end
   
   # remove authorized_keys files for all other users  
@@ -60,8 +61,9 @@ class SshAuthorizedKeys < Recipe
       ::Dust.print_msg "deleting other authorized_keys files\n"
       @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
+        home = @node.get_home user
+        if @node.file_exists? "#{home}/.ssh/authorized_keys", :quiet => true
+          @node.rm "#{home}/.ssh/authorized_keys", :indent => 2
         end
       end
     end

data/lib/dust/server.rb

@@ -80,8 +80,10 @@ module Dust
       f.print content
       f.close
       
-      Dust.print_result scp(f.path, destination, :quiet => true), options
+      ret = Dust.print_result scp(f.path, destination, :quiet => true), options
       f.unlink
+      
+      ret
     end
 
     def append destination, newcontent, options = {}
@@ -420,6 +422,19 @@ module Dust
       Dust.print_result exec(cmd)[:exit_code], options
     end
 
+    # returns the home directory of this user
+    def get_home user, options = {}
+      options = default_options(:quiet => true).merge options
+      
+      Dust.print_msg "getting home directory of #{user}"
+      ret = exec "grep #{user} /etc/passwd |cut -d':' -f6"
+      if Dust.print_result ret[:exit_code]     
+        return ret[:stdout].chomp
+      else
+        return false
+      end
+    end
+
     # collect additional system facts using puppets facter
     def collect_facts options = {}
       options = default_options.merge options

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
   - 5
-  version: 0.4.5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 +01:00
+date: 2012-01-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency