chef_backup 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e93ff902d1ff9163a4d97186565f789f62b49610a5b8e841724d7e08116e08f8
-  data.tar.gz: aebb94b9cd8ebcb9fab88e633f4845ca5a54724e07e34563f4bd235b23293054
+  metadata.gz: abf3acd4e6bd56e159617ce5fc550b0eca43520bb9a804cac9795ffb86b05c07
+  data.tar.gz: 997e7b9b797959b88b5cff52de0d8f5b10ece2fd23098d89e69a7ac67efba21d
 SHA512:
-  metadata.gz: 75134c17007ac79e63f88ba436e60e8c76444c9b4520038883dbed88a66fba42415b5cf54f73ee2c12a98d3e5b9c23baf1613d3ce7b53491c7bd07ab3f18553a
-  data.tar.gz: edeb8933695fd89f768090a02da71fa1a52d08e1f0f7823c4fb6ec82abdbb684f70c2147d3b144e845221261c926f1f963a2122ba33a17647631f6e667c4d502
+  metadata.gz: 476e6227c7b64a8fe35467802aca311f5c6c8b80241bb54b21f0ef5d08c40041c218760e965f54798a2806521397c6b272507a7a8f4503c00aafbe3280c7a2e3
+  data.tar.gz: b0d905d8893045fe1c3c3b0ee2c43b785d26d122825abf98185e1e492d6e03f479d228895be01b8d74728fdfd14090c29bcb1eafea56e3246f550e163bcbf52e

data/lib/chef_backup/config.rb

@@ -1,6 +1,7 @@
 require "fileutils" unless defined?(FileUtils)
 require "json" unless defined?(JSON)
 require "forwardable" unless defined?(Forwardable)
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 module ChefBackup
   # ChefBackup Global Config
@@ -12,10 +13,10 @@ module ChefBackup
       "backup" => {
         "always_dump_db" => true,
         "strategy" => "none",
-        "export_dir" => "/var/opt/chef-backup",
-        "project_name" => "opscode",
-        "ctl-command" => "chef-server-ctl",
-        "running_filepath" => "/etc/opscode/chef-server-running.json",
+        "export_dir" => "/var/opt/#{ChefUtils::Dist::Infra::SHORT}-backup",
+        "project_name" => ChefUtils::Dist::Org::LEGACY_CONF_DIR,
+        "ctl-command" => ChefUtils::Dist::Server::SERVER_CTL,
+        "running_filepath" => "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/#{ChefUtils::Dist::Server::SERVER}-running.json",
         "database_name" => "opscode_chef",
       },
     }.freeze

data/lib/chef_backup/helpers.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'mixlib/shellout'
 require 'chef_backup/config'
 require 'chef_backup/logger'
+require 'chef-utils/dist'
 
 # rubocop:disable ModuleLength
 # rubocop:disable IndentationWidth
@@ -29,7 +30,7 @@ module Helpers
       'ctl_command' => 'opscode-analytics-ctl'
     },
     'chef-ha' => {
-      'config_file' => '/etc/opscode/chef-server.rb'
+      'config_file' => "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/#{ChefUtils::Dist::Server::SERVER}.rb"
     },
     'chef-sync' => {
       'config_file' => '/etc/chef-sync/chef-sync.rb',

data/lib/chef_backup/strategy/restore/tar.rb

@@ -1,6 +1,7 @@
 require "fileutils" unless defined?(FileUtils)
 require "pathname" unless defined?(Pathname)
 require "forwardable" unless defined?(Forwardable)
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 require "chef_backup/deep_merge"
 
 # rubocop:disable IndentationWidth
@@ -93,7 +94,7 @@ class TarRestore
   end
 
   def touch_sentinel
-    dir = "/var/opt/opscode"
+    dir = "/var/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}"
     sentinel = File.join(dir, "bootstrapped")
     FileUtils.mkdir_p(dir) unless File.directory?(dir)
     File.open(sentinel, "w") { |file| file.write "bootstrapped!" }
@@ -135,11 +136,11 @@ class TarRestore
 
   def fix_ha_plugins
     log "Fixing HA plugins directory (https://github.com/chef/chef-server/issues/115)"
-    plugins_dir = "/var/opt/opscode/plugins"
+    plugins_dir = "/var/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/plugins"
     drbd_plugin = File.join(plugins_dir, "chef-ha-drbd.rb")
 
     FileUtils.mkdir_p(plugins_dir) unless Dir.exist?(plugins_dir)
-    FileUtils.ln_sf("/opt/opscode/chef-server-plugin.rb", drbd_plugin) unless
+    FileUtils.ln_sf("/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/chef-server-plugin.rb", drbd_plugin) unless
       File.exist?(drbd_plugin)
   end
 
@@ -158,8 +159,8 @@ class TarRestore
 
   def touch_drbd_ready
     log "Touching drbd_ready file"
-    FileUtils.touch("/var/opt/opscode/drbd/drbd_ready") unless
-      File.exist?("/var/opt/opscode/drbd/drbd_ready")
+    FileUtils.touch("/var/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/drbd/drbd_ready") unless
+      File.exist?("/var/opt/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/drbd/drbd_ready")
   end
 
   def reconfigure_server

data/lib/chef_backup/version.rb

@@ -1,4 +1,4 @@
 # ChefBackup module
 module ChefBackup
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_backup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: chef-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 16.5.54
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 16.5.54
 description: A library to backup a Chef Server
 email:
 - oss@chef.io