knife-ec-backup 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfb061efc0e39818119aa5e0d6d2fc1b4e30c67f
-  data.tar.gz: a7bd9fc29f6f2bfbe5d3f880bdc6fc6b1eb5fbcb
+  metadata.gz: 76b450dcd76db4d13569e2a0bb2698f33903f0bb
+  data.tar.gz: 70a79178d91d74240cd2db487e4ba0e6a0d1ca24
 SHA512:
-  metadata.gz: 4675c0ab2bcb626aa2b5203c0ebfaab596d430b882ea086f0fb82c41e5f29e4e4f833b7c34b3e98b60638c85f56e3a4ee135b603e5b50f54e12b083eddb47b4e
-  data.tar.gz: 720765653920c29a05ab32a522a2e0796292af9dfe26fcbe55d6d1573054a43d4943d192a93c765668852a7072785f4bbbd2ad8c2bc6fa7a2677793e52a4d9aa
+  metadata.gz: da50a45648d1e64559b71aefad81a9e9b2097c2a8673c46346546ea03ca89753c9f1c2cfa81ee1e18cb9ac023d241d36dc9cda3c413d751be51e61359ff523b9
+  data.tar.gz: db4a3f1de0962d1dd30eabb0bf441c49073f796d6f5af7499161cf8dfc94cf7daa6faabe0df33a4b03d872bcd1bad7dbca44ec4797da83f8001d69a718ead63b

data/README.md

@@ -12,11 +12,17 @@ This knife plugin currently requires the Knife-Essentials gem to be installed in
 
 # Installation
 
-This knife plugin is packaged as a gem.  To install it, clone the
-git repository and run the following:
+## Chef Server Install (Recommended)
+This will install the plugin directly on the Chef Server:
+
+    /opt/opscode/embedded/bin/gem install knife-ec-backup
+    /opt/opscode/embedded/bin/gem install knife-ec-backup
+
+## Build from source
+Clone the git repository and run the following from inside:
 
     gem build knife-ec-backup.gemspec
-    gem install knife-ec-backup-1.0.0.gem
+    gem install knife-ec-backup-1.1.1.gem
 
 # Configuration
 
@@ -37,6 +43,8 @@ It is recommended that you run this from a frontend Enterprise Chef Server, you
     Used to set the path to the WebUI Key (default: /etc/opscode/webui_priv.pem)
   * `--skip-useracl`:
     Whether to skip downloading User ACLs.  This is required for EC 11.0.0 and lower (default: false)
+  * `--skip-version-check'`:
+    Whether to skip checking the Chef Server version.  This will also skip any auto-configured options (default: false)
 
 Creates a repository of an entire Enterprise Chef / Private Chef server.
 
@@ -102,6 +110,8 @@ This compares very closely with the "knife download /" from an OSC server:
     Whether to overwrite pivotal's key.  Once this is done, future requests will fail until you fix the private key (default: false)
   * `--skip-useracl`:
     Whether to skip downloading User ACLs.  This is required for EC 11.0.0 and lower (default: false)
+  * `--skip-version-check'`:
+    Whether to skip checking the Chef Server version.  This will also skip any auto-configured options (default: false)
 
 Restores all data from a repository to an Enterprise Chef / Private Chef server.
 

data/lib/chef/knife/ec_backup.rb

@@ -19,6 +19,12 @@ class Chef
         :default => false,
         :description => "Whether to skip downloading User ACLs.  This is required for EC 11.0.0 and lower"
 
+      option :skip_version,
+        :long => '--skip-version-check',
+        :boolean => true,
+        :default => false,
+        :description => "Whether to skip checking the Chef Server version.  This will also skip any auto-configured options"
+
       deps do
         require 'chef_fs/config'
         require 'chef_fs/file_system'
@@ -74,33 +80,38 @@ class Chef
         end
 
         rest = Chef::REST.new(Chef::Config.chef_server_root)
-        user_acl_rest = Chef::REST.new("http://127.0.0.1:9465")
-
-        # Grab Chef Server version number so that we can auto set options
-        uri = URI.parse("#{Chef::Config.chef_server_root}/version")
-        version_manifest = open(uri, {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE})
-        server_version = version_manifest.grep(/private-chef /).first.split(' ').last
-
-        server_version_parts = server_version.split('.')
-
-        if server_version_parts.count == 3
-          puts "Detected Enterprise Chef Server version: #{server_version}"
-
-          # All versions of Chef Server below 11.0.1 are missing the GET User ACL helper in nginx
-          if server_version_parts[0] < 11 || (server_version_parts[0] == 11 && server_version_parts[1] == 0 && server_version_parts[0] < 1)
-            #Check to see if Opscode-Account can be directly from the local machine  
-            begin
-              user_acl_rest.get('users')
-              ui.warn("Your version of Enterprise Chef Server does not support the downloading of User ACLs.  Using local connection to backup")
-            rescue
-              ui.warn("Your version of Enterprise Chef Server does not support the downloading of User ACLs.  Setting skip-useracl to TRUE")
-              config[:skip_useracl] = true
-              user_acl_rest = nil
+       
+        if config[:skip_version] && config[:skip_useracl]
+          ui.warn("Skipping the Chef Server version check.  This will also skip any auto-configured options")
+          user_acl_rest = nil
+        elsif config[:skip_version] && !config[:skip_useracl]
+          ui.warn("Skipping the Chef Server version check.  This will also skip any auto-configured options")
+          user_acl_rest = rest
+        else # Grab Chef Server version number so that we can auto set options
+          uri = URI.parse("#{Chef::Config.chef_server_root}/version")
+          server_version = open(uri, {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).each_line.first.split(' ').last
+          server_version_parts = server_version.split('.')
+
+          if server_version_parts.count == 3
+            puts "Detected Enterprise Chef Server version: #{server_version}"
+
+            # All versions of Chef Server below 11.0.1 are missing the GET User ACL helper in nginx
+            if server_version_parts[0] < 11 || (server_version_parts[0] == 11 && server_version_parts[1] == 0 && server_version_parts[0] < 1)
+              #Check to see if Opscode-Account can be directly from the local machine  
+              begin
+                user_acl_rest.get('users')
+                ui.warn("Your version of Enterprise Chef Server does not support the downloading of User ACLs.  Using local connection to backup")
+                user_acl_rest = Chef::REST.new("http://127.0.0.1:9465")
+              rescue
+                ui.warn("Your version of Enterprise Chef Server does not support the downloading of User ACLs.  Setting skip-useracl to TRUE")
+                config[:skip_useracl] = true
+                user_acl_rest = nil
+              end
             end
-          end
 
-        else
-          ui.warn("Unable to detect Chef Server version.")
+          else
+            ui.warn("Unable to detect Chef Server version.")
+          end
         end
 
         # Grab users

data/lib/chef/knife/ec_restore.rb

@@ -25,6 +25,11 @@ class Chef
         :default => false,
         :description => "Whether to skip restoring User ACLs.  This is required for EC 11.0.2 and lower"
 
+      option :skip_version,
+        :long => '--skip-version-check',
+        :boolean => true,
+        :default => false,
+        :description => "Whether to skip checking the Chef Server version.  This will also skip any auto-configured options"
 
       deps do
         require 'chef/json_compat'
@@ -83,23 +88,28 @@ class Chef
           Chef::Config.chef_server_root = server_root
         end
 
-        # Grab Chef Server version number so that we can auto set options
-        uri = URI.parse("#{Chef::Config.chef_server_root}/version")
-        version_manifest = open(uri, {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE})
-        server_version = version_manifest.grep(/private-chef /).first.split(' ').last
-
-        server_version_parts = server_version.split('.')
-
-        if server_version_parts.count == 3
-          puts "Detected Enterprise Chef Server version: #{server_version}"
-
-          # All versions of Chef Server below 11.0.X are unable to update user acls
-          if server_version_parts[0] < 11 || (server_version_parts[0] == 11 && server_version_parts[1] == 0)
-            ui.warn("Your version of Enterprise Chef Server does not support the updating of User ACLs.  Setting skip-useracl to TRUE")
-            config[:skip_useracl] = true
+        if config[:skip_version] && config[:skip_useracl]
+          ui.warn("Skipping the Chef Server version check.  This will also skip any auto-configured options")
+          user_acl_rest = nil
+        elsif config[:skip_version] && !config[:skip_useracl]
+          ui.warn("Skipping the Chef Server version check.  This will also skip any auto-configured options")
+          user_acl_rest = rest
+        else # Grab Chef Server version number so that we can auto set options
+          uri = URI.parse("#{Chef::Config.chef_server_root}/version")
+          server_version = open(uri, {ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).each_line.first.split(' ').last
+          server_version_parts = server_version.split('.')
+
+          if server_version_parts.count == 3
+            puts "Detected Enterprise Chef Server version: #{server_version}"
+
+            # All versions of Chef Server below 11.0.X are unable to update user acls
+            if server_version_parts[0] < 11 || (server_version_parts[0] == 11 && server_version_parts[1] == 0)
+              ui.warn("Your version of Enterprise Chef Server does not support the updating of User ACLs.  Setting skip-useracl to TRUE")
+              config[:skip_useracl] = true
+            end
+          else
+            ui.warn("Unable to detect Chef Server version.")
           end
-        else
-          ui.warn("Unable to detect Chef Server version.")
         end
 
         # Restore users

data/lib/knife_ec_backup/version.rb

@@ -1,3 +1,3 @@
 module KnifeECBackup
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - John Keiser