landscape-turner 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4fe0a8a8c79aa180889465f95c1e318fcc8101
-  data.tar.gz: 2d67990ab696469ebc70673c4f603cf25dcf8345
+  metadata.gz: fce39e5e4432beb6819c739ea116a9ddc491d50a
+  data.tar.gz: dbbdc68c5a9fd9fbf5d911c668cb7e627f02f1dd
 SHA512:
-  metadata.gz: 2a5b44b8e3aee06592865e2a6684626a23459e3931ab44de90a89a800321334a97aca8536534a62eecd64b38955be85feaa4a0659b3299336a2d732d379eaa5b
-  data.tar.gz: e46b52fe5b359d83728342bb8806942d57d216ede933fd4d8dab71dfb4945e4bbb74b52b56c4c54a1465be14a759a6fed105f60c7b91a71e895011fd9a0973b0
+  metadata.gz: 487cde05678cc20b3ef9e45a1820203a2b7b494f4f77ded0a9f52e21ac746ed4aec20e33b57a1eb31bf0687fa22d7ae7a90379b70f6ed53c997d4005bec8a32d
+  data.tar.gz: 838ae56c7e4ddfce499d39447720b0247e533df47b6c3eb7d28655eedaf0e44280c02603b0cbe7844bafc13a5a48bdf3480b1a14d32e820187149ce8c33c1fe8

data/README.md

@@ -1,10 +1,6 @@
 # Landscape Turner
 
-Landscape Turner is a set of two ruby scripts for backing up the Landscape service, `landscape-turner-backup` and `landscape-turner-restore`.
-
-## License
-
-Landscape Turner is MIT Licensed.
+Landscape Turner is a set of two ruby scripts for backing up the Landscape service, 	`landscape-turner-backup` and `landscape-turner-restore` .
 
 ## General Usage
 
@@ -34,6 +30,7 @@ Path to prefix default landscape dirs (/var, /etc), default is nothing.
 ### -p, --no-op
 No-op (dry run)
 
+
 To override specific paths, use `-o name1=path1 -o name2=path2 -o name3=path3`. To disable specific paths for backup, use `-d name1 -d name2`. Overrides have higher priority than `--landscape-prefix`.
 
 ## Options for landscape-turner-restore

data/Rakefile

@@ -1,8 +1,3 @@
-#
-# Copyright 2016, DAQRI LLC.
-#
-# This code is covered by the MIT License (see LICENSE.txt)
-
 require "rake/testtask"
 
 Rake::TestTask.new do |t|

data/bin/console

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-#
-# Copyright 2016, DAQRI LLC.
-#
-# This code is covered by the MIT License (see LICENSE.txt)
 
 require "bundler/setup"
 require "landscape_turner"

data/bin/setup

@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
-#
-# Copyright 2016, DAQRI LLC.
-#
-# This code is covered by the MIT License (see LICENSE.txt)
-
 set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
 bundle install
+
+# Do any other automated setup that you need to do here

data/exe/landscape-turner-backup

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-#
-# Copyright 2016, DAQRI LLC.
-#
-# This code is covered by the MIT License (see LICENSE.txt)
 
 require 'landscape-turner/backup'
 

data/exe/landscape-turner-restore

@@ -1,14 +1,10 @@
 #!/usr/bin/env ruby
-#
-# Copyright 2016, DAQRI LLC.
-#
-# This code is covered by the MIT License (see LICENSE.txt)
 
 require 'landscape-turner/restore'
 
 if ENV['USER'] != "root"
   puts "You must have root permissions to run this tool."
-  exit
+  exit 
 end
-
+  
 Restore.restore_with_cli_args

data/lib/landscape-turner/backup.rb

@@ -1,8 +1,3 @@
-#
-# Copyright 2016, DAQRI LLC.
-#
-# This code is covered by the MIT License (see LICENSE.txt)
-
 require_relative 'helpers'
 require 'fileutils'
 require 'pathname'
@@ -32,7 +27,14 @@ class Backup
       opt :landscape_prefix,      "Path to prefix default landscape dirs (/var, /etc) with", :default => "/"
       opt :no_op,                 "No-op (dry run)"
       opt :sudo,                  "Program to use as sudo",                                  :default => "sudo"
-
+      opt :x509_certificate,      "Path to landscape x509 certificate",                      :type => String
+      opt :ca_certificate,        "Path to landscape CA certificatess" ,                     :type => String
+      opt :ssl_private_key,       "Path to Landscape's private key",                         :type => String
+      opt :postgresql_config,     "Path to landscape's Postgresql config",                   :type => String
+      opt :apache_config,         "Path to Apache config",                                   :type => String
+      opt :hash_id_database,      "Path to Hash ID databases",                               :type => String
+      opt :landscape_dir,         "Path to landscape directory",                             :type => String
+      opt :landscape_default,     "Path to default landscape server directory",              :type => String
       banner <<-USAGE
 To override specific paths, use -o name1=path1 -o name2=path2 -o name3=path3
 To disable specific paths for backup, use -d name1 -d name2
@@ -48,17 +50,16 @@ Names with default values:
     prefix = new_args[:landscape_prefix]
     paths.each { |k, v| paths[k] = "#{prefix}#{v}" }
 
-    (new_args[:override] || []).each do |o|
-      key, val = o.split("=")
-      key = key.to_sym
-      raise "Unrecognized name argument: #{key.inspect}!" unless paths[key]
-      paths[key] = val
-    end
-
+   path_args = new_args.clone
+   [:snapshot_path, :override, :disable, :no_db, :landscape_prefix, :no_op, :sudo].each { |k| path_args.delete(k) }
+   (path_args || []).each do |o|
+     raise "Unrecognized path  argument: #{key.inspect}!" unless paths[o]
+     paths[o] = path_args[o]
+   end 
+ 
     (new_args[:disable] || []).each do |d|
-      d = d.to_sym
-      raise "Unrecognized name argument: #{d.inspect}!" unless paths[d]
-      paths.delete d
+      raise "Unrecognized name argument: #{d.inspect}!" unless paths[key]
+      paths.delete d.to_sym
     end
 
     backup_landscape(new_args, paths, prefix)
@@ -97,16 +98,16 @@ Names with default values:
     end
     # remove the folder where we stored everything
     operate ? FileUtils.remove_dir(destination) : nil
-    puts "Finished backing up to #{destination}"
+    puts "Finished backing up to #{destination}"     
   end
 
   def self.dump_landscape_databases(backup_destination)
     FileUtils.mkdir("#{backup_destination}/postgresql_backup") rescue nil
-    get_landscape_databases().each { |database_name|
+    get_landscape_databases().each { |database_name| 
     # pg_dump dbname > outfile
     safe_system("cd /tmp && sudo -u postgres pg_dump #{database_name} > #{database_name}.bak")
     FileUtils.mv("/tmp/#{database_name}.bak","#{backup_destination}/postgresql_backup/")
-    }
+    }  
   end
 
   def self.check_consistent_tar(destination)
@@ -116,7 +117,7 @@ Names with default values:
     hash_folder1 = Open3.capture3("find #{destination} -type f 2>/dev/null -exec md5sum {} \;")
     hash_folder2 = Open3.capture3("find /tmp/tar_check -type f 2>/dev/null -exec md5sum {} \;")
     FileUtils.rm_rf("/tmp/tar_check")
-    return hash_folder1 == hash_folder2
+    return hash_folder1 == hash_folder2     
   end
 
 end

data/lib/landscape-turner/helpers.rb

@@ -1,8 +1,3 @@
-#
-# Copyright 2016, DAQRI LLC.
-#
-# This code is covered by the MIT License (see LICENSE.txt)
-
 require 'open3'
 
 module LandscapeTurner

data/lib/landscape-turner/restore.rb

@@ -1,8 +1,3 @@
-#
-# Copyright 2016, DAQRI LLC.
-#
-# This code is covered by the MIT License (see LICENSE.txt)
-
 require_relative 'helpers'
 require_relative 'backup'
 require 'fileutils'
@@ -12,7 +7,7 @@ require 'fileutils'
 
 class Restore
   extend LandscapeTurner::Helpers
-  POSTGRES_CONFIG = "/etc/postgresql/9.3/main"
+  POSTGRES_CONFIG = "/etc/postgresql/9.5/main"
   EXCLUDE_FILES = [POSTGRES_CONFIG]
   def self.restore_with_cli_args(args = ARGV)
     opts = Trollop.options(args) do
@@ -60,7 +55,7 @@ In addition to optional arguments, give exactly one .tar.gz file to restore.
         with_service_stopped("postgresql") do
           replace(POSTGRES_CONFIG,"/tmp/landscape_backup/#{POSTGRES_CONFIG}")
         end
-      end
+      end      
 
       puts "Restoration of Landscape configuration completed."
 
@@ -73,7 +68,7 @@ In addition to optional arguments, give exactly one .tar.gz file to restore.
     puts "Copying #{filename} to #{File.dirname(filename_replace)}..."
     FileUtils.cp_r(filename, File.dirname(filename_replace), :preserve => true, :remove_destination => true)
   end
-
+ 
 
   def self.restore_landscape_databases(restore_location)
     #clear the databases first
@@ -88,5 +83,5 @@ In addition to optional arguments, give exactly one .tar.gz file to restore.
 
   end
 
-
+    
 end

data/lib/landscape-turner/version.rb

@@ -1,8 +1,3 @@
-#
-# Copyright 2016, DAQRI LLC.
-#
-# This code is covered by the MIT License (see LICENSE.txt)
-
 module LandscapeTurner
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: landscape-turner
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Justin Boisvert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A backup tool for the Landscape service that backs up the configuration
@@ -98,17 +98,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Backup tool for the Landscape service