dust-deploy 0.13.16 → 0.13.17

data/changelog.md

@@ -1,10 +1,32 @@
 Changelog
 =============
 
+0.13.17
+------------
+
+-  small bugfixes
+-  postfix recipe now supports sql backends
+
+    recipes:
+      nginx:
+        postfix:
+          sql:
+            relay_domains.cf:
+              host: /var/run/postgresql
+              user: postfixadmin
+              dbname: postfix
+              query: "SELECT domain FROM domain WHERE domain='%s' and backupmx = true"
+            virtual_alias_maps.cf:
+              host: /var/run/postgresql
+              user: postfixadmin
+              dbname: postfix
+              query: "SELECT goto FROM alias WHERE address='%s' AND active = true"
+
+
 0.13.16
 ------------
 
-- nginx also supports mulitple packages now
+-  nginx also supports mulitple packages now
 
     recipes:
       nginx:
@@ -14,7 +36,7 @@ Changelog
 0.13.15
 ------------
 
-- postfix and dovecot recipes now support multiple packages.
+-  postfix and dovecot recipes now support multiple packages.
 
     recipes:
       dovecot:

data/lib/dust/recipes/cups_client.rb

@@ -7,6 +7,7 @@ class CupsClient < Recipe
       @node.rm('/etc/cups/client.conf')
     else
       return false unless install
+      @node.mkdir('/etc/cups')
       @node.messages.add("setting servername to: #{@config}").ok
       @node.write '/etc/cups/client.conf', "ServerName #{@config}\n"
     end

data/lib/dust/recipes/duplicity.rb

@@ -38,8 +38,11 @@ class Duplicity < Recipe
 
       # add hostkey to known_hosts
       if config['hostkey']
-        msg = @node.messages.add('checking if ssh key is in known_hosts')
-        unless msg.parse_result(@node.exec("grep -q '#{config['hostkey']}' /root/.ssh/known_hosts")[:exit_code] == 0)
+        msg = @node.messages.add('checking if ssh key is in known_hosts: ')
+        if @node.exec("grep -q '#{config['hostkey']}' /root/.ssh/known_hosts")[:exit_code] == 0
+          msg.ok('yes')
+        else
+          msg.ok('no')
           @node.mkdir '/root/.ssh', :indent => 2
           @node.append '/root/.ssh/known_hosts', "#{config['hostkey']}\n", :indent => 2
         end

data/lib/dust/recipes/postfix.rb

@@ -34,6 +34,17 @@ class Postfix < Recipe
       @node.write "#{@config['etc_dir']}/master.cf", master_cf
     end
 
+    if @config['sql']
+      @node.messages.add("configuring sql database\n")
+      @node.mkdir("#{@config['etc_dir']}/sql")
+
+      @config['sql'].each do |file, config|
+        content = ''
+        config.each { |key, value| content << "#{key} = #{value}\n" }
+        @node.write("#{@config['etc_dir']}/sql/#{file}", content, :indent => 2)
+      end
+    end
+
     @node.restart_service @config['service'] if @options.restart?
     @node.reload_service @config['service'] if @options.reload?
   end

data/lib/dust/server.rb

@@ -133,7 +133,7 @@ module Dust
     def append destination, newcontent, options = {}
       options = default_options.merge options
 
-      messages.add("appending to #{File.basename destination}", options)
+      msg = messages.add("appending to #{File.basename destination}", options)
 
       content = exec("cat #{destination}")[:stdout]
       content.concat newcontent

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.13.16"
+  VERSION = "0.13.17"
 end

metadata

@@ -1,116 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dust-deploy
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 13
-  - 16
-  version: 0.13.16
+version: !ruby/object:Gem::Version
+  version: 0.13.17
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - kris kechagia
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-03 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: net-scp
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: net-sftp
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ipaddress
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: colorize
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-description: when puppet and chef suck because you want to be in control and sprinkle just cannot do enough for you
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: when puppet and chef suck because you want to be in control and sprinkle
+  just cannot do enough for you
+email:
 - kk@rndsec.net
-executables: 
+executables:
 - dust
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -186,35 +207,28 @@ files:
 - lib/dust/recipes/zabbix_agent.rb
 - lib/dust/server.rb
 - lib/dust/version.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dust-deploy
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: small server deployment tool for complex environments
 test_files: []
-