mondupe 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b96c50086a408f34b757f09df9ee7e44d9224da
-  data.tar.gz: d428ad64d5aa4d7244f7525ebe32cdb30b8a2430
+  metadata.gz: 0006b87e2549eb7f41df32766cae37b019cebcc1
+  data.tar.gz: b561adb1e93b78e98770265e48e0d57238972cdc
 SHA512:
-  metadata.gz: 1be599141a1fecc4c3f67b5013b1f20f3bbe02dc093337399ec684c288604692984034b4f7691c3a945d5f0bfd3bdd19ecfab82b65ce1ad2c7d8b11bde5def75
-  data.tar.gz: 9dc632b98e945c2aef4c45b6e5371e41df6d772390d72869ec649d7dbbac3ce86981c46fdb77e95897313114ec9b9b0d31154669d8820b1baabf104d639ba23a
+  metadata.gz: 3467656b563b145a23aec9f4fabf4366d45a319b618edc48f19eea9304fd04fe1795d122c5dd9255b2156d134668ba4ea6107da4c9ee7d667b741a709d7c39e6
+  data.tar.gz: 6233d1f9bee088940acf1b20b1e7b4783910898a1c22e65ab920e65a16c0a8ca82ddcb9cba4b1631d858e22753825aa3e27aa63966de3ec7c2b8f47d9ca40dde

data/bin/mondupe

@@ -22,7 +22,7 @@ opt_parser = OptionParser.new do |opt|
   opt.separator "                    Requires -n [name] -a [ipaddress]"
   opt.separator "      restore    - Restore a mongo dump that exists on a host"
   opt.separator "                    Requires -n [name] -a [ipaddress]"
-  opt.separator "                    Optional -t [tmpdir]"
+  opt.separator "                    Optional -t [tmpdir] -u [mongo_username] -p [mongo_password] -c [mongo_authdb]"
   opt.separator "      expire     - (coming soon) Reset the expiration days of a node"
   opt.separator "                    Requires ( -n [name] || -d [id] || -a [ipaddress] ) -e [expire_days]"
   opt.separator "      list       - (coming soon) List all mongo hosts."
@@ -70,6 +70,22 @@ opt_parser = OptionParser.new do |opt|
     $options[:size] = size
   end
 
+  opt.on("-n","--mongodbname","Database name to restore to") do |mongo_db_name|
+    $options[:mongo_db_name] = mongo_db_name
+  end
+
+  opt.on("-u","--mongouser","Username to authenticate to mongodb with") do |mongo_user|
+    $options[:mongo_user] = mongo_user
+  end
+
+  opt.on("-p","--mongopass","Password to authenticate to mongodb with") do |mongo_pass|
+    $options[:mongo_pass] = mongo_pass
+  end
+
+  opt.on("-c","--mongoauthdb","Database to authenticate against for mongo") do |mongo_auth_db|
+    $options[:mongo_auth_db] = mongo_auth_db
+  end
+
   opt.on("-h","--help","help") do
     puts opt_parser
   end
@@ -81,6 +97,11 @@ opt_parser = OptionParser.new do |opt|
   opt.separator "   - MONDUPE_S3_BUCKET_NAME"
   opt.separator "   - MONDUPE_KEY_PAIR_NAME"
   opt.separator ""
+  opt.separator "  Optional: (no default)"
+  opt.separator "   - MONGO_USER"
+  opt.separator "   - MONGO_PASS"
+  opt.separator "   - MONGO_AUTH_DB"
+  opt.separator ""
   opt.separator "  Optional: (have sane defaults)"
   opt.separator "   - MONDUPE_INSTANCE_IMAGE_ID"
   opt.separator "   - MONDUPE_CHEF_RUN_LIST"
@@ -89,6 +110,9 @@ opt_parser = OptionParser.new do |opt|
   opt.separator "   - MONDUPE_SSH_KEY"
   opt.separator "   - MONDUPE_SSH_USER"
   opt.separator "   - MONDUPE_DUMP_FILE_NAME"
+  opt.separator ""
+  opt.separator "  Optional as ENV Variable. Must be specified via command line or ENV. No default."
+  opt.separator "   - MONGO_DB_NAME"
 end
 
 opt_parser.parse!
@@ -101,6 +125,10 @@ instance_ipaddress = $options[:ipaddress] || nil
 instance_id = $options[:id] || nil
 dump_tmp_path = $options[:tmpdir] || '/tmp'
 expire_days = $options[:expire_days] || 3
+mongo_db_name = $options[:mongo_db_name] || ENV['MONGO_DB_NAME'] || nil
+mongo_user = $options[:mongo_user] || ENV['MONGO_USER'] || nil
+mongo_pass = $options[:mongo_pass] || ENV['MONGO_PASS'] || nil
+mongo_auth_db = $options[:mongo_auth_db] || ENV['MONGO_AUTH_DB'] || nil
 instance_count = 1
 chef_run_list = ENV['MONDUPE_CHEF_RUN_LIST'] || ""
 chef_environment = ENV['MONDUPE_CHEF_ENVIRONMENT'] || "default"
@@ -114,7 +142,7 @@ security_group = ENV['MONDUPE_SECURITY_GROUP'] || nil
 s3_bucket_name = ENV['MONDUPE_S3_BUCKET_NAME'] || nil
 dump_file_name = ENV['MONDUPE_DUMP_FILE_NAME'] || 'mongodb.dump.tgz'
 knife_exec = ENV['MONDUPE_KNIFE_EXEC'] || 'knife'
-instance_volume_size = 80
+instance_volume_size = 60
 
 case ARGV[0]
 when "create"
@@ -125,7 +153,7 @@ when "create"
   Mondupe.new.create_dns(instance_fqdn, route53_domain, instance)
   Mondupe.new.bootstrap(instance_name, instance_fqdn, instance.ip_address, chef_environment, chef_identity_file, chef_run_list, ssh_user, knife_exec)
   Mondupe.new.get_db_dump_from_s3(instance.ip_address, s3_bucket_name, dump_tmp_path, ssh_user, dump_file_name)
-  Mondupe.new.restore_db(instance.ip_address, dump_tmp_path, ssh_key, ssh_user, dump_file_name)
+  Mondupe.new.restore_db(instance.ip_address, dump_tmp_path, ssh_key, ssh_user, dump_file_name, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
   puts " - - - Total Run Time: #{((total_seconds % 3600) / 60).to_i}m #{((total_seconds % 3600) % 60).to_i}s - - -"
 when "delete"
   puts "delete mongo host"
@@ -138,7 +166,7 @@ when "dumps3"
   Mondupe.new.get_db_dump_from_s3(instance_ipaddress, s3_bucket_name, dump_tmp_path, ssh_user, dump_file_name)
 when "restore"
   puts "Restoring mongo database from dump"
-  Mondupe.new.restore_db(instance_ipaddress, dump_tmp_path, ssh_key, ssh_user, dump_file_name)
+  Mondupe.new.restore_db(instance_ipaddress, dump_tmp_path, ssh_key, ssh_user, dump_file_name, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
 when "terminate"
   puts "Marking instance for termination"
   Mondupe.new.terminate_instance(instance_id)

data/lib/mondupe.rb

@@ -112,31 +112,39 @@ class Mondupe
     puts "Download URL: #{download_url}"
     puts "#{Time.now.to_s} - Starting download."
     puts "  Please wait..."
-    `ssh -i ~/.ssh/DevOps.pem #{ssh_user}@#{instance_ip} "sudo mkdir -p #{dump_tmp_path} && sudo chown -R #{ssh_user} #{dump_tmp_path} && cd #{dump_tmp_path} && wget '#{download_url}' -O #{File.join(dump_tmp_path, dump_file_name)} 2&>1"`
+    `ssh -i ~/.ssh/DevOps.pem #{ssh_user}@#{instance_ip} "sudo mkdir -p #{dump_tmp_path} && cd #{dump_tmp_path} && wget '#{download_url}' -O #{File.join(dump_tmp_path, dump_file_name)} 2&>1"`
     puts "#{Time.now.to_s} - Download completed"
   end
 
-  def restore_db(instance_ip, dump_tmp_path, ssh_key, ssh_user, dump_file_name)
+  def add_user(instance_ip, username, password, database, roles)
+    #add db users here
+  end
+
+  def restore_db(instance_ip, dump_tmp_path, ssh_key, ssh_user, dump_file_name, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
     # Restore from the database dump
     # TODO - Fail the process if any step fails
+    abort "You must specify a database name to drop and restore. Use -n [name] or ENV['MONGO_DB_NAME'] to set this value." if mongo_db_name.nil?
+    db_connect_string = "mongo #{mongo_db_name}"
+    db_connect_string << " -u \"#{mongo_user}\" -p \"#{mongo_pass}\"" if !mongo_user.nil? && !mongo_pass.nil?
+    db_connect_string << " --authenticationDatabase \"#{mongo_auth_db}\"" if !mongo_auth_db.nil?
     puts "#{Time.now.to_s} - Dropping existing database"
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "echo 'db.dropDatabase()' | mongo cde_production"`
+    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "echo 'db.dropDatabase()' | #{db_connect_string}"`
     if $?.success? then puts "#{Time.now.to_s} - Database drop complete" else abort("Error dropping database") end
     puts "Extracting database dump archive file..."
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "cd #{dump_tmp_path}; tar xf #{dump_file_name}"`
     if $?.success? then puts "#{Time.now.to_s} - Extraction complete!" else abort("Error extracting archive") end
-    puts "Restoring Mongo Database from extracted dump: #{File.join(dump_tmp_path, "cde_production")}"
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "time mongorestore #{File.join(dump_tmp_path, "cde_production")}"`
+    puts "Restoring Mongo Database from extracted dump: #{File.join(dump_tmp_path, "#{mongo_db_name}")}"
+    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "time mongorestore #{File.join(dump_tmp_path, "#{mongo_db_name}")}"`
     if $?.success? then puts "#{Time.now.to_s} - Database restore complete!" else abort("Error restoring databse") end
     puts "Removing database archive file"
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "rm -rf #{File.join(dump_tmp_path, dump_file_name)}"`
     if $?.success? then puts "#{Time.now.to_s} - Archive removed!" else abort("Error removing archive") end
     puts "#{Time.now.to_s} - Removing saved searches"
-    puts `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "mongo cde_production --eval \\"db.users.update({save_searches: {$ne: null}}, {$unset: {save_searches: ''}}, {multi: true})\\""`
+    puts `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "#{db_connect_string} --eval 'db.users.update({save_searches: {$ne: null}}, {$unset: {save_searches: \\"\\"}}, {multi: true})'"`
     #Need to find a way to test the prior command as it does not return a success or fail like the other commands
     #if $?.success? then puts "#{Time.now.to_s} - Saved searches removed" else abort("Error removing saved searches") end
     puts "#{Time.now.to_s} - Cleaning up our mess..."
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "rm -rf #{File.join(dump_tmp_path, 'cde_production')}"`
+    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "rm -rf #{File.join(dump_tmp_path, "#{mongo_db_name}")}"`
     if $?.success? then puts "#{Time.now.to_s} - Mess cleaned up!" else abort("Error cleaning up after myself...") end
   end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: mondupe
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Philip Hutchins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.38'
 description: Create an AWS EC2 node and restore a MongoDB dump to it from an AWS S3
@@ -44,12 +44,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -59,4 +59,3 @@ signing_key:
 specification_version: 4
 summary: MonDupe
 test_files: []
-has_rdoc: