backup 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7e83c99df63edb4998a75a49d81a06b0d1039ca
-  data.tar.gz: 5080aa4b34f9fc9104a1f312ad7418398b041148
+  metadata.gz: 5ca73fdee095965690119b7f88bd58f3275ca09e
+  data.tar.gz: a8d4446e87d9315ca051bb92a613c3608a777f5e
 SHA512:
-  metadata.gz: 2e80a87dbf0a0d93cdb5ce0fb9a3f10c9b68b7d2ab2d49b5f30e8a77e3bf5763669ee7f0b853800283f3097c3c18fe0fc53f186dd0fbdb2bb5bacaf58b423c61
-  data.tar.gz: 2dacfb012d43a5e19434427d76ddd0ddb3b03913eba7dce02ce3947397be1b7b3f663fb74bcd04e93ee5006c27c7487c2c5cdb61cff1e2200562e5e0bbe0a413
+  metadata.gz: 565291689a33745325adc776df783c1d314a50db30e5566bd0ac641a62df0f80788cc2c4c0eb64983a39fed23408047b7a9f6fd24a38d9cc2abfe63870f0d3fd
+  data.tar.gz: e1928778dc5c60155163f1a1994a74c3a0c07206c711b5f7ff5be58115906f25b6577878054a6a3c5d2e78b66eb1c36a7762a89bd0de60f71a903c99cb459c65

data/lib/backup.rb

@@ -76,6 +76,7 @@ module Backup
     autoload :MongoDB,    File.join(DATABASE_PATH, 'mongodb')
     autoload :Redis,      File.join(DATABASE_PATH, 'redis')
     autoload :Riak,       File.join(DATABASE_PATH, 'riak')
+    autoload :OpenLDAP,   File.join(DATABASE_PATH, 'openldap')
   end
 
   ##

data/lib/backup/cli.rb

@@ -142,6 +142,9 @@ module Backup
 
       rescue Exception => err
         Logger.error Error.wrap(err)
+        unless Helpers.is_backup_error? err
+          Logger.error err.backtrace.join("\n")
+        end
         # Logger configuration will be ignored
         # and messages will be output to the console only.
         Logger.abort!
@@ -219,6 +222,9 @@ module Backup
         Config.load(options)
       rescue Exception => err
         Logger.error Error.wrap(err)
+        unless Helpers.is_backup_error? err
+          Logger.error err.backtrace.join("\n")
+        end
       end
 
       if Logger.has_warnings? || Logger.has_errors?
@@ -357,6 +363,10 @@ module Backup
           exec(cmd)
         end
 
+        def is_backup_error?(error)
+          error.class.ancestors.include? Backup::Error
+        end
+
       end
     end
 

data/lib/backup/config/dsl.rb

@@ -27,7 +27,7 @@ module Backup
           create_modules(
             DSL,
             [ # Databases
-              ['MySQL', 'PostgreSQL', 'MongoDB', 'Redis', 'Riak'],
+              ['MySQL', 'PostgreSQL', 'MongoDB', 'Redis', 'Riak', 'OpenLDAP'],
               # Storages
               ['S3', 'CloudFiles', 'Ninefold', 'Dropbox', 'FTP',
               'SFTP', 'SCP', 'RSync', 'Local'],

data/lib/backup/database/openldap.rb

@@ -0,0 +1,95 @@
+# encoding: utf-8
+
+module Backup
+  module Database
+    class OpenLDAP < Base
+      class Error < Backup::Error; end
+
+      ##
+      # Name of the ldap backup
+      attr_accessor :name
+
+      ##
+      # run slapcat under sudo if needed
+      # make sure to set SUID on a file, to let you run the file with permissions of file owner
+      # eg. sudo chmod u+s /usr/sbin/slapcat
+      attr_accessor :use_sudo
+
+      ##
+      # Stores the location of the slapd.conf or slapcat confdir
+      attr_accessor :slapcat_conf
+
+      ##
+      # Additional slapcat options
+      attr_accessor :slapcat_args
+
+      ##
+      # Path to slapcat utility (optional)
+      attr_accessor :slapcat_utility
+
+      ##
+      # Takes the name of the archive and the configuration block
+      def initialize(model, database_id = nil, &block)
+        super
+        instance_eval(&block) if block_given?
+
+        @name             ||= 'ldap_backup'
+        @use_sudo         ||= false
+        @slapcat_args     ||= Array.new
+        @slapcat_utility  ||= utility(:slapcat)
+        @slapcat_conf     ||= '/etc/ldap/slapd.d'
+      end
+
+      ##
+      # Performs the slapcat command and outputs the
+      # data to the specified path based on the 'trigger'
+      def perform!
+        super
+
+        pipeline = Pipeline.new
+        dump_ext = 'ldif'
+
+        pipeline << slapcat
+        if @model.compressor
+          @model.compressor.compress_with do |command, ext|
+            pipeline << command
+            dump_ext << ext
+          end
+        end
+
+        pipeline << "#{ utility(:cat) } > " +
+            "'#{ File.join(dump_path, dump_filename) }.#{ dump_ext }'"
+
+        pipeline.run
+        if pipeline.success?
+          log!(:finished)
+        else
+          raise Error, "Dump Failed!\n" + pipeline.error_messages
+        end
+      end
+
+      private
+
+      ##
+      # Builds the full slapcat string based on all attributes
+      def slapcat
+        command = "#{ slapcat_utility } #{ slapcat_conf_option } #{ slapcat_conf } #{ user_options }"
+        command.prepend("sudo ") if use_sudo
+        command
+      end
+
+      ##
+      # Uses different slapcat switch depending on confdir or conffile set
+      def slapcat_conf_option
+        @slapcat_conf.include?(".d") ? "-F" : "-f"
+      end
+
+      ##
+      # Builds a compatible string for the additional options
+      # specified by the user
+      def user_options
+        slapcat_args.join(' ')
+      end
+    end
+  end
+end

data/lib/backup/notifier/slack.rb

@@ -22,6 +22,14 @@ module Backup
       # The username to display along with the notification
       attr_accessor :username
 
+      ##
+      # The emoji icon to display along with the notification
+      #
+      # See http://www.emoji-cheat-sheet.com for a list of icons.
+      #
+      # Default: :floppy_disk:
+      attr_accessor :icon_emoji
+
       ##
       # Array of statuses for which the log file should be attached.
       #
@@ -34,6 +42,7 @@ module Backup
         instance_eval(&block) if block_given?
 
         @send_log_on ||= [:warning, :failure]
+        @icon_emoji  ||= ':floppy_disk:'
       end
 
       private
@@ -64,7 +73,7 @@ module Backup
         message = "#{ tag } #{ model.label } (#{ model.trigger })"
 
         data = { :text => message }
-        [:channel, :username].each do |param|
+        [:channel, :username, :icon_emoji].each do |param|
           val = send(param)
           data.merge!(param => val) if val
         end

data/lib/backup/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Backup
-  VERSION = '4.0.3'
+  VERSION = '4.0.4'
 end

data/templates/cli/databases/openldap

@@ -0,0 +1,24 @@
+  ##
+  # OpenLDAP [Database]
+  #
+  database OpenLDAP do |db|
+    # Name of the ldap backup
+    db.name = "my_database_name"
+
+    # Additional "slapcat" options
+    # defaults to an empty list of options
+    # db.slapcat_args      = []
+
+    # run slapcat under sudo if needed
+    # defaults to "false"
+    # db.use_sudo = true
+
+    # Stores the location of the slapd.conf,
+    # defaults to "/etc/ldap/slapd.d" confdir
+    # you can use also conf file instead of directory
+    # db.slapcat_conf = /path/to/slapd.conf
+
+    # Optional: Use to set the location of slapcat utility
+    # if it cannot be found by name in your $PATH
+    # db.slapcat_utility = "/opt/local/bin/slapcat"
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -575,6 +575,7 @@ files:
 - lib/backup/database/base.rb
 - lib/backup/database/mongodb.rb
 - lib/backup/database/mysql.rb
+- lib/backup/database/openldap.rb
 - lib/backup/database/postgresql.rb
 - lib/backup/database/redis.rb
 - lib/backup/database/riak.rb
@@ -634,6 +635,7 @@ files:
 - templates/cli/config
 - templates/cli/databases/mongodb
 - templates/cli/databases/mysql
+- templates/cli/databases/openldap
 - templates/cli/databases/postgresql
 - templates/cli/databases/redis
 - templates/cli/databases/riak