rds_backup_service 0.0.2 → 0.0.3

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 .bundle
 config/accounts.yml
+config/settings.yml
 pkg/*
 *~
 .DS_Store

data/config/{settings.yml → settings.example.yml}

@@ -24,3 +24,13 @@ backup_bucket: rdsbackups
 # defaults to Ruby's Dir.tmpdir
 
 #tmp_dir: "/tmp"
+
+# The "From" address in sent emails
+# defaults to rdsbackups@localhost
+
+#email_from: "rdsbackups@localhost"
+
+# Use TLS when sending email over ESMTP?
+# defaults to false
+
+#email_tls: false

data/lib/rds_backup_service/config.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 module RDSBackup
   # models logic for post-configuration setup
   module Config
@@ -9,6 +10,7 @@ module RDSBackup
       # Configuration
       log.info "Scanning system..."
       (system = Ohai::System.new).all_plugins
+      FileUtils.rm_f("1")
       log.info "Reading config files..."
       settings = RDSBackup.settings
       ec2_group_name = settings['ec2_security_group']
@@ -54,7 +56,9 @@ module RDSBackup
         log.warn "Not running in EC2 - open RDS groups to this host!"
       else
         unless this_host = ec2.servers.get(system[:ec2][:instance_id])
-          log.warn "Not running in EC2 account #{s3_acc_name}!"
+          accts = RDSBackup.read_accounts.select{|id,acc| acc[:service] == 'Compute'}
+          raise "At least one S3 account must be defined" if accts.empty?
+          log.warn "Not running in EC2 account #{accts.first[0]}!"
         else
           log.info "Running in EC2. Current Security Groups = #{this_host.groups}"
           unless this_host.groups.include? ec2_group_name

data/lib/rds_backup_service/model/backup_job.rb

@@ -240,6 +240,7 @@ module RDSBackup
       @log.info "Emailing #{@options[:email]}..."
       begin
         RDSBackup::Email.new(self).send!
+        @log.info "Email sent to #{@options[:email]} for job #{backup_id}"
       rescue Exception => e
         @log.warn "Error sending email: #{e.message.split("\n").first}"
       end

data/lib/rds_backup_service/model/email.rb

@@ -3,31 +3,37 @@ module RDSBackup
   # an email representation of a Job, that can send itself to recipients.
   class Email
 
-    attr_reader :job
+    attr_reader :job, :settings
 
     # constructor - requires an RDSBackup::Job
     def initialize(backup_job)
-      @job = backup_job
+      @job, @settings = backup_job, RDSBackup.settings
+      use_tls = settings['email_tls'] != 'false'
+      Mail.defaults do
+        delivery_method :smtp, {enable_starttls_auto: use_tls}
+      end
     end
 
     # Attempts to send email through local ESMTP port 25.
     # Raises an Exception on failure.
     def send!
       raise "job #{job.backup_id} has no email option" unless job.options[:email]
-      main_text = body_text # define local variables for closure over Mail.new
-      recipients = job.options[:email]
-      header = "Backup of RDS #{job.rds_id} (job ID #{job.backup_id})"
+      # define local variables for closure over Mail.new
+      from_address  = settings['email_from']
+      to_address    = job.options[:email]
+      subject_text  = "Backup of RDS #{job.rds_id} (job ID #{job.backup_id})"
+      body_text     = body
       mail = Mail.new do
-        from    'rdsbackupservice@mdsol.com'
-        to      recipients
-        subject header
-        body    "#{main_text}\n"
+        from    from_address
+        to      to_address
+        subject subject_text
+        body    "#{body_text}\n"
       end
       mail.deliver!
     end
 
     # defines the body of a Job's status email
-    def body_text
+    def body
       msg = "Hello.\n\n"
       if job.status == 200
         msg += "Your backup of database #{job.rds_id} is complete.\n"+

data/lib/rds_backup_service/rds_backup_service.rb

@@ -43,6 +43,8 @@ module RDSBackup
       'rds_security_group'  => 'rds-backup-service',
       'ec2_security_group'  => 'rds-backup-service',
       'tmp_dir'             => Dir.tmpdir,
+      'email_from'          => 'rdsbackups@localhost',
+      'email_tls'           => 'false',
     }.merge(YAML::load(
       File.read(settings_file || "./config/settings.yml")))
   end

data/lib/rds_backup_service/version.rb

@@ -1,6 +1,6 @@
 module RDSBackup
   # The version of this Gem / Library.
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 
   # This library's version of the REST API.
   API_VERSION = "1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rds_backup_service
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -188,7 +188,7 @@ files:
 - Rakefile
 - config.ru
 - config/accounts.example.yml
-- config/settings.yml
+- config/settings.example.yml
 - lib/rds_backup_service.rb
 - lib/rds_backup_service/config.rb
 - lib/rds_backup_service/model/backup_job.rb
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2653342598528617899
+      hash: 1295335590809769143
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2653342598528617899
+      hash: 1295335590809769143
 requirements: []
 rubyforge_project: rds_backup_service
 rubygems_version: 1.8.24