dust-deploy 0.16.2 → 0.16.3

data/changelog.md

@@ -1,6 +1,22 @@
 Changelog
 =============
 
+0.16.3
+------------
+
+-  get_gid() is now more efficient
+-  nginx recipe now creates needed directories
+-  adds certificate support to nginx recipe
+   it will copy over certificates from templates/nginx/certs to /etc/nginx/certs
+
+    recipes:
+      nginx:
+        certs:
+          - www.example.com.key
+          - www.example.com.crt
+          - { cert-in-templates-dir: target-filename }
+
+
 0.16.2
 ------------
 

data/lib/dust/recipes/nginx.rb

@@ -1,13 +1,21 @@
+require 'erb'
+
 class Nginx < Recipe
   desc 'nginx:deploy', 'installs and configures nginx web server'
   def deploy
     # default package to install
     @config['package'] ||= 'nginx'
+    @config['user'] ||= 'nginx' if @node.uses_rpm?
+    @config['user'] ||= 'www-data' if @node.uses_apt?
 
     @config['package'].to_array.each do |package|
       return unless @node.install_package(package)
     end
 
+    @node.mkdir('/etc/nginx')
+    @node.mkdir('/etc/nginx/sites-enabled')
+    @node.mkdir('/etc/nginx/sites-available')
+
     @node.deploy_file("#{@template_path}/nginx.conf", '/etc/nginx/nginx.conf', :binding => binding)
 
     # remove old sites that may be present
@@ -27,6 +35,37 @@ class Nginx < Recipe
       end
     end
 
+    # deploy ssl certificates to /etc/nginx/certs
+    @config['certs'] ||= []
+    Array(@config['certs']).each do |file|
+      # file can either be
+      # a string 'file': file is just copied over
+      # a hash { 'source': 'target' } when source and target filename differ
+
+      if file.is_a? String
+        source = "#{@template_path}/certs/#{file}"
+        destination = "/etc/nginx/certs/#{File.basename(file)}"
+
+      elsif file.is_a? Hash
+        source = "#{@template_path}/certs/#{File.basename(file.keys.first)}"
+        destination = "/etc/nginx/certs/#{File.basename(file.values.first)}"
+
+      else
+        return @node.messages.add("#{file.inspect} is neither String nor Hash!").failed
+      end
+
+      unless File.exists?(source)
+        @node.messages.add("#{source} not found. skipping.").warning
+        next
+      end
+
+      @node.mkdir(File.dirname(destination))
+      @node.deploy_file(source, destination)
+      @node.chown("#{@config['user']}:#{@node.get_gid(@config['user'])}", destination)
+      @node.chmod('0600', destination)
+    end
+
+
     # check configuration and restart nginx
     msg = @node.messages.add('checking nginx configuration')
     ret = @node.exec('/etc/init.d/nginx configtest')

data/lib/dust/server.rb

@@ -823,7 +823,7 @@ module Dust
       options = default_options(:quiet => true).merge(options)
 
       msg = messages.add("getting primary gid of #{user}", options)
-      ret = exec("getent passwd |cut -d':' -f1,4 |grep '^#{user}' |head -n1 |cut -d: -f2")
+      ret = exec("id -g #{user}")
       if msg.parse_result(ret[:exit_code])
         return ret[:stdout].chomp
       else

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.16.2"
+  VERSION = "0.16.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json