danarchy_deploy 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 637fb3a1e9810606d864cbc0acab785194ce1fd101c1d74b1135cda4cf489229
-  data.tar.gz: 8886abdb6002348b7fe4fe1d9b27e90766bfd568b30513d246460b2c2dadd188
+  metadata.gz: 1cebdd523daec796bb3189d1fce8b0f48296e575a0c84ec731a3983acf856868
+  data.tar.gz: aaf5be0aa79434f6982051ab9472b868f591c4e0025a2fe076210fccf94fa4be
 SHA512:
-  metadata.gz: 1bd45a91ea250c523e7ddaca5f8b06e91f8ebd52ede360389fb612354e383720b316f9652aa94400d6ec1204b02205b3556dcabf47842a17350e04c46389b1e9
-  data.tar.gz: 74283e5e2b7ee9d6d3abb15791fc9a742c1e8329eba28d680185380e4682799749b13c848923f3c6b77b2c9ed3fa8585f3f8b0619289aecd11eae363737f9e12
+  metadata.gz: 0a08ce041b150b6033e6a6d644cd4f90682479fca8c214ede36c440e02eed573a3a9508ec432d219e9ba8097e73d901253c6ed1da9c12527c590f079dcf44395
+  data.tar.gz: ddbcf529c9b5a5612d3e6f455017e82fa98c870244fbfe6709e480bb07b9c787ffc5fd0ed53d686de796e3256646b309fa3dbb5493d4d9d55607fdf77b8ec8d9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+patch_0.2.9
+- cleanup emerge --sync output
+- change Date to Time
+- fix hostnamectl set-hostname
+- Fstab: skip formatting NFS mountpoints
+
 patch_0.2.8
 - Switch support from RVM to ASDF
 - users.rb: use Templater to handle authorized_users and sudoers

data/bin/danarchy_deploy

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require_relative '../lib/danarchy_deploy'
 require 'danarchy_couchdb'
-require 'date'
 require 'optparse'
 
 deployment = nil

data/lib/danarchy_deploy/applicator/ssl.rb

@@ -7,7 +7,7 @@ module DanarchyDeploy
       end
 
       class LetsEncrypt
-        # DateTime.now > DateTime.parse(cert.grep(/Not After/).first.split(' : ').last) - 7
+        # Time.now > Time.parse(cert.grep(/Not After/).first.split(' : ').last) - 7
       end
     end
   end

data/lib/danarchy_deploy/archiver.rb

@@ -10,7 +10,7 @@ module DanarchyDeploy
 
         tmparchive = false
         if !archive[:source] && archive[:data]
-          archive[:source] = options[:deploy_dir] + "/.tmp_archive_#{DateTime.now.strftime("%Y%m%d_%H%M%S")}"
+          archive[:source] = options[:deploy_dir] + "/.tmp_archive_#{Time.now.strftime("%Y%m%d_%H%M%S")}"
           tmparchive = true
           data = DanarchyDeploy::Helpers.decode_base64(archive[:data])
           write_tmp_archive(archive[:source], data)

data/lib/danarchy_deploy/system/centos.rb

@@ -17,7 +17,7 @@ module DanarchyDeploy
 
       private
       def set_hostname(hostname)
-        `hostnamectl hostname #{hostname}`
+        `hostnamectl set-hostname #{hostname}`
       end
     end
   end

data/lib/danarchy_deploy/system/debian.rb

@@ -60,7 +60,7 @@ module DanarchyDeploy
 
       private
       def set_hostname(hostname)
-        `hostnamectl hostname #{hostname}`
+        `hostnamectl set-hostname #{hostname}`
       end
     end
   end

data/lib/danarchy_deploy/system/fstab.rb

@@ -39,11 +39,7 @@ module DanarchyDeploy
         puts "\n > Formatting mountpoints"
 
         fstab[:mounts].each do |mount|
-          fs_check = DanarchyDeploy::Helpers.run_command(
-            "file -sL #{mount[:filesystem]}", options
-          )
-
-          if fs_check[:stdout] && fs_check[:stdout] =~ /.*data$/
+          if fs_check(mount, options) == true
             puts "\n   > Formatting #{mount[:filesystem]}"
             mkfs = DanarchyDeploy::Helpers.run_command(
               "mkfs -t #{mount[:type]} #{mount[:filesystem]}", options
@@ -55,6 +51,20 @@ module DanarchyDeploy
                                                    !Dir.exist?(mount[:mountpoint])
         end
       end
+
+      def self.fs_check(mount, options)
+        return false if mount[:type] =~ /^nfs/
+
+        fs_check = DanarchyDeploy::Helpers.run_command(
+          "file -sL #{mount[:filesystem]}", options
+        )
+
+        if fs_check[:stdout] && fs_check[:stdout] =~ /.*data$/
+          return true
+        else
+          return false
+        end
+      end
     end
   end
 end

data/lib/danarchy_deploy/system/gentoo.rb

@@ -49,18 +49,19 @@ module DanarchyDeploy
       end
 
       def self.emerge_sync(sync, options)
+        puts "\n >  Gentoo Emerge Sync"
         if sync.nil?
-          install_cron_template(sync, options)
+          install_sync_cron(sync, options)
         elsif sync == false
-          puts "\nNot running emerge sync; set to: #{sync}"
-          install_cron_template(sync, options)
+          puts "\n   - Not running emerge sync; set to: #{sync}"
+          install_sync_cron(sync, options)
         elsif sync == true
           File.delete('/var/spool/cron/crontabs/portage') if File.exist?('/var/spool/cron/crontabs/portage')
           DanarchyDeploy::Helpers.run_command('emerge --sync &>/var/log/emerge-sync.log', options)
         elsif sync =~ /([0-9]{1,2}|\*|\@[a-z]{4,7})/i
-          install_cron_template(sync, options)
+          install_sync_cron(sync, options)
         else
-          puts "\nUnknown sync cron time: #{sync}. Not running emerge sync!"
+          puts "\n   ! Unknown sync cron time: #{sync}. Not running emerge sync!"
         end
       end
 
@@ -73,7 +74,7 @@ module DanarchyDeploy
         end
       end
 
-      def self.install_cron_template(sync, options)
+      def self.install_sync_cron(sync, options)
         templates = if sync.nil? || sync == false
                       [
                         {

data/lib/danarchy_deploy/system/opensuse.rb

@@ -21,7 +21,7 @@ module DanarchyDeploy
 
       private
       def set_hostname(hostname)
-        `hostnamectl hostname #{hostname}`
+        `hostnamectl set-hostname #{hostname}`
       end
     end
   end

data/lib/danarchy_deploy/system.rb

@@ -25,7 +25,7 @@ module DanarchyDeploy
       else
         puts "\n   - Not installing packages."
         puts "       |_ Packages selected: #{deployment[:packages].count}"
-        puts "       |_ Updates  selected: #{deployment[:system][:update]}"
+        puts "       |_ Install/Update: #{deployment[:system][:update]}"
       end
 
       puts "\n > #{deployment[:os].capitalize} System Updates"
@@ -35,7 +35,7 @@ module DanarchyDeploy
         puts updater_result[:stdout] if updater_result[:stdout]
       else
         puts "\n   - Not running #{deployment[:os].capitalize} system updates."
-        puts "       |_ Updates selected: #{deployment[:system][:update]}"
+        puts "       |_ Install/Update: #{deployment[:system][:update]}"
       end
 
       if install_result || updater_result

data/lib/danarchy_deploy/version.rb

@@ -1,3 +1,3 @@
 module DanarchyDeploy
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/lib/danarchy_deploy.rb

@@ -9,6 +9,7 @@ module DanarchyDeploy
   require_relative 'danarchy_deploy/templater'
   require_relative 'danarchy_deploy/users'
   require_relative 'danarchy_deploy/version'
+  require 'time'
 
   class LocalDeploy
     def self.new(deployment, options)
@@ -26,7 +27,7 @@ module DanarchyDeploy
       deployment = DanarchyDeploy::Users.new(deployment, options)
       deployment = DanarchyDeploy::Services::Init.new(deployment, options)
 
-      deployment[:last_deploy] = DateTime.now.strftime("%Y/%m/%d %H:%M:%S")
+      deployment[:last_deploy] = Time.now.strftime("%Y/%m/%d %H:%M:%S")
       puts "\nFinished Local Deployment at #{deployment[:last_deploy]}!"
 
       if options[:deploy_file].end_with?('.json')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Dan James
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-07 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danarchy_couchdb