danarchy_deploy 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4665ec27120f6fda4337da5a2b2cb465511534cef96b47c2a11791076012f64
-  data.tar.gz: e12104840e0273bf38d37a0465752ebc5bacc53d2d0f4a5b5783a936f5810afb
+  metadata.gz: 637fb3a1e9810606d864cbc0acab785194ce1fd101c1d74b1135cda4cf489229
+  data.tar.gz: 8886abdb6002348b7fe4fe1d9b27e90766bfd568b30513d246460b2c2dadd188
 SHA512:
-  metadata.gz: 4bc766ba4a3e8f6e0e691dd1904029f9c08cd6b040146214ae31fb0c18b3a779bae3258b033b1b50205f70c02ebfdbc1fcdd5756ae5ef7b727ce8225397cb4b4
-  data.tar.gz: 7b22f9218392944730cec707bbf62cf9cc9c696fd411eccf02e6d7ceff54748b141c76b2b3de6750867287e9221a17f0be08be524a29c58e14b38b6741da4036
+  metadata.gz: 1bd45a91ea250c523e7ddaca5f8b06e91f8ebd52ede360389fb612354e383720b316f9652aa94400d6ec1204b02205b3556dcabf47842a17350e04c46389b1e9
+  data.tar.gz: 74283e5e2b7ee9d6d3abb15791fc9a742c1e8329eba28d680185380e4682799749b13c848923f3c6b77b2c9ed3fa8585f3f8b0619289aecd11eae363737f9e12

data/.asdf_versions.json

@@ -0,0 +1,5 @@
+{
+  "ruby": [
+    "latest:3.2.2"
+  ]
+}

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.2

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+patch_0.2.8
+- Switch support from RVM to ASDF
+- users.rb: use Templater to handle authorized_users and sudoers
+- danarchy_deploy.rb: ignore WARNs in gem install
+- danarchy_deploy.rb: use sudo -i to load environment
+- Templater: add builtin templates
+- Gentoo: wait_for_sync
+- System::Init: OpenRC runlevel support
+
+patch_0.2.7
+- Patch Templater ERB.new for Ruby versions higher than 2.6
+- Allow builtin:: templates in Templater
+- System: allow :system:updates in template to control what to install/update
+- System: do not return if :system is not defined in template
+
 patch_0.2.6
 - DanarchyDeploy: gem install --bindir
 - DanarchyDeploy: return from each class if not defined in a deployment

data/Gemfile.lock

@@ -1,26 +1,27 @@
 PATH
   remote: .
   specs:
-    danarchy_deploy (0.2.6)
+    danarchy_deploy (0.2.8)
       danarchy_couchdb (~> 0.1)
-      mongo (~> 2.17)
+      mongo (~> 2.20)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bson (4.14.1)
+    bson (5.0.1)
     danarchy_couchdb (0.1.3)
-    mongo (2.17.0)
-      bson (>= 4.8.2, < 5.0.0)
-    rake (13.0.6)
+    mongo (2.20.1)
+      bson (>= 4.14.1, < 6.0.0)
+    rake (13.2.1)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.3)
+  bundler (~> 2.5)
   danarchy_deploy!
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.3.9
+   2.5.11

data/danarchy_deploy.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "danarchy_couchdb", "~> 0.1"
+  spec.add_dependency 'danarchy_couchdb', '~> 0.1'
 
-  spec.add_development_dependency "bundler", "~> 2.3"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency 'bundler', '~> 2.5'
+  spec.add_development_dependency 'rake', '~> 13.0'
 
-  spec.add_runtime_dependency "mongo", "~> 2.17"
+  spec.add_runtime_dependency 'mongo', '~> 2.20'
 end

data/lib/danarchy_deploy/groups.rb

@@ -18,7 +18,6 @@ module DanarchyDeploy
         end
       end
 
-      # [groupadd_result, groupdel_result]
       deployment
     end
 

data/lib/danarchy_deploy/services/init/openrc.rb

@@ -3,9 +3,10 @@ module DanarchyDeploy
   module Services
     class Init
       class Openrc
-        def initialize(service, options)
-          @service = service
-          @options = options
+        def initialize(service, runlevel, options)
+          @service  = service
+          @runlevel = runlevel
+          @options  = options
         end
 
         def status
@@ -58,13 +59,16 @@ module DanarchyDeploy
         end
 
         def enable
-          cmd = "rc-update add #{@service} default"
+          cmd = "rc-update add #{@service} #{@runlevel}"
           DanarchyDeploy::Helpers.run_command(cmd, @options)
         end
 
         def disable
-          cmd = "rc-update del #{@service} default"
-          DanarchyDeploy::Helpers.run_command(cmd, @options)
+          Dir["/etc/runlevels/*/#{@service}"].each do |svc|
+            runlevel, service = svc.split('/')[3,4]
+            cmd = "rc-update del #{service} #{runlevel}"
+            DanarchyDeploy::Helpers.run_command(cmd, @options)
+          end
         end
       end
     end

data/lib/danarchy_deploy/services/init.rb

@@ -10,42 +10,52 @@ module DanarchyDeploy
 
         deployment[:services].each do |service, params|
           next if ! params[:init]
-          orig_actions = params[:init]
-          puts "\n > Init actions for #{service}: #{params[:init].join(', ')}"
-          params[:init].each do |action|
-            puts "    |+ Taking action: #{action} on #{service}"
+          if params[:init].class == Array
+            # one-time update for :init to new format
+            params[:init] =  if deployment[:os] == 'gentoo'
+                               { runlevel: 'default', actions: params[:init] }
+                             else
+                               { actions: params[:init] }
+                             end
+          end
+
+          init_manager(deployment[:os], service, params[:init][:runlevel], options)
+          puts "\n > Init actions for #{service}: #{params[:init][:actions].join(', ')}"
+          params[:init][:actions].each do |action|
+            puts "    |> Taking action: #{action} on #{service}"
             if options[:pretend]
-              puts "       Fake run: #{action} #{service}"
+              puts "     |- Fake run: #{action} #{service}"
             else
-              init_manager(deployment[:os], service, action, options)
+              init_run(action)
             end
           end
-
-          params[:init] = orig_actions
         end
 
         deployment
       end
 
-      def self.init_manager(os, service, action, options)
-        init = if os == 'gentoo'
-                 DanarchyDeploy::Services::Init::Openrc.new(service, options)
-               else
-                 DanarchyDeploy::Services::Init::Systemd.new(service, options)
-               end
+      private
+      def self.init_manager(os, service, runlevel='default', options)
+        @init = if os == 'gentoo'
+                  DanarchyDeploy::Services::Init::Openrc.new(service, runlevel, options)
+                else
+                  DanarchyDeploy::Services::Init::Systemd.new(service, options)
+                end
+      end
 
-        init_result = init.send(action)
+      def self.init_run(action)
+        init_result = @init.send(action)
 
         if stderr = init_result[:stderr]
           if stderr.include?('unknown function')
-            puts "       ! Action: #{action} not available for service: #{service}.\n" +
+            puts "       ! Action: #{action} not available for service.\n" +
                  "          ! A restart may be needed! Otherwise, remove this action from the deployment.\n" +
                  "          ! Not taking any action here.\n"
           else
-            abort("       ! Action: #{action} #{service} failed!")
+            abort("       ! Action: #{action} failed!")
           end
         else
-          puts "       |+ Action: #{action} #{service} succeeded."
+          puts "       |+ Action: #{action} succeeded."
         end
       end
     end

data/lib/danarchy_deploy/services.rb

@@ -10,7 +10,6 @@ module DanarchyDeploy
       puts "\n" + self.name
 
       deployment[:services].each do |service, params|
-        next if service == :init
         puts "\nConfiguring service: #{service}"
 
         if params[:archives] && !params[:archives].empty?

data/lib/danarchy_deploy/system/centos.rb

@@ -6,12 +6,19 @@ module DanarchyDeploy
         puts "\n" + self.name
         puts "#{deployment[:os].capitalize} detected! Using yum."
         # needs more testing
+
+        set_hostname(deployment[:hostname]) if !options[:pretend]
         installer = 'yum install -y '
         updater = 'yum upgrade -y'
         cleaner = 'yum clean all'
 
         [installer, updater, cleaner]
       end
+
+      private
+      def set_hostname(hostname)
+        `hostnamectl hostname #{hostname}`
+      end
     end
   end
 end

data/lib/danarchy_deploy/system/debian.rb

@@ -7,6 +7,7 @@ module DanarchyDeploy
         puts "\n" + self.name
         puts "#{deployment[:os].capitalize} detected! Using apt."
 
+        set_hostname(deployment[:hostname]) if !options[:pretend]
         if deployment[:apt]
           if deployment[:apt][:templates]
             puts "\nChecking Apt configs."
@@ -56,6 +57,11 @@ module DanarchyDeploy
           end
         end
       end
+
+      private
+      def set_hostname(hostname)
+        `hostnamectl hostname #{hostname}`
+      end
     end
   end
 end

data/lib/danarchy_deploy/system/gentoo.rb

@@ -6,12 +6,7 @@ module DanarchyDeploy
         puts "\n" + self.name
         puts 'Gentoo detected! Using emerge.'
 
-        hostname = deployment[:hostname]
-        if check_hostname(hostname) == false
-          puts "Setting hostname to: #{hostname}"
-          set_hostname(hostname)
-        end
-
+        set_hostname(deployment[:hostname]) if !options[:pretend]
         installer  = 'emerge --usepkg --buildpkg --quiet --noreplace '
         # This needs cpuid2cpuflags to build make.conf; don't --pretend here.
         system("qlist -I cpuid2cpuflags &>/dev/null || #{installer} cpuid2cpuflags &>/dev/null")
@@ -23,43 +18,108 @@ module DanarchyDeploy
         cleaner  = 'emerge --depclean --quiet '
         cleaner += '--pretend ' if options[:pretend]
 
+        if emerge_sync_in_progress
+          puts "\n >  Waiting for emerge sync to complete."
+          emerge_sync_wait
+        end
+
         if deployment[:portage]
           if deployment[:portage][:templates]
             puts "\nChecking Portage configs."
             DanarchyDeploy::Templater.new(deployment[:portage][:templates], options)
           end
 
-          emerge_sync(options) if deployment[:portage][:sync]
+          emerge_sync(deployment[:portage][:sync], options)
         end
 
         [installer, updater, cleaner]
       end
 
       private
+      def self.emerge_sync_in_progress
+        repo_path = `emerge --info | grep location`.chomp.split(': ').last
+        Dir.exist?(repo_path + '/.tmp-unverified-download-quarantine')
+      end
 
-      def self.emerge_sync(options)
-        File.open('/tmp/datetime', 'a+') do |f|
-          last_sync = f.getbyte ? DateTime.parse(f.read) : (DateTime.now - 2)
-
-          if (DateTime.now - last_sync).to_i != 0
-            puts "\nUpdating Portage repo..."
-            DanarchyDeploy::Helpers.run_command('emerge --sync --quiet 2>/dev/null', options)
-            f.truncate(0)
-            f.write DateTime.now
-          end
+      def self.emerge_sync_wait
+        while emerge_sync_in_progress
+          sleep 3
+        end
+        puts "     |> Continuing with emerge!"
+      end
 
-          f.close
+      def self.emerge_sync(sync, options)
+        if sync.nil?
+          install_cron_template(sync, options)
+        elsif sync == false
+          puts "\nNot running emerge sync; set to: #{sync}"
+          install_cron_template(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)
+        else
+          puts "\nUnknown sync cron time: #{sync}. Not running emerge sync!"
         end
       end
 
       def self.set_hostname(hostname)
-        confd_hostname = "hostname=\"#{hostname}\""
-        File.write('/etc/conf.d/hostname', confd_hostname)
-        `hostname #{hostname}`
+        if `hostname`.chomp != hostname
+          puts "Setting hostname to: #{hostname}"
+          confd_hostname = "hostname=\"#{hostname}\""
+          File.write('/etc/conf.d/hostname', confd_hostname)
+          `hostname #{hostname}`
+        end
       end
 
-      def self.check_hostname(hostname)
-        `hostname`.chomp == hostname
+      def self.install_cron_template(sync, options)
+        templates = if sync.nil? || sync == false
+                      [
+                        {
+                          target: '/var/spool/cron/crontabs/portage',
+                          remove: true
+                        }
+                      ]
+                    else
+                      [
+                        {
+                          source: 'builtin::system/crontab.erb',
+                          target: '/var/spool/cron/crontabs/portage',
+                          dir_perms: {
+                            owner: 'root',
+                            group: 'crontab',
+                            mode: '1730'
+                          },
+                          file_perms: {
+                            owner: 'portage',
+                            group: 'crontab',
+                            mode: '0600'
+                          },
+                          variables: {
+                            shell: '/bin/bash',
+                            path: '/usr/local/sbin:/usr/local/bin:/usr/bin',
+                            env: '',
+                            jobs: [
+                              {
+                                schedule: sync,
+                                command: 'emerge --sync &>/var/log/emerge-sync.log'
+                              },
+                              {
+                                schedule: '@daily',
+                                command: 'eclean-dist &>/dev/null'
+                              },
+                              {
+                                schedule: '@daily',
+                                command: 'eclean-pkg &>/dev/null'
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    end
+
+        DanarchyDeploy::Templater.new(templates, options)
       end
     end
   end

data/lib/danarchy_deploy/system/opensuse.rb

@@ -6,6 +6,7 @@ module DanarchyDeploy
         puts "\n" + self.name
         puts "#{deployment[:os].capitalize} detected! Using zypper."
 
+        set_hostname(deployment[:hostname]) if !options[:pretend]
         puts "Updating zypper repositories..."
         DanarchyDeploy::Helpers.run_command('sudo zypper refresh', options)
 
@@ -17,6 +18,11 @@ module DanarchyDeploy
 
         [installer, updater, cleaner]
       end
+
+      private
+      def set_hostname(hostname)
+        `hostnamectl hostname #{hostname}`
+      end
     end
   end
 end

data/lib/danarchy_deploy/system.rb

@@ -3,32 +3,43 @@ require_relative 'system/debian'
 require_relative 'system/gentoo'
 require_relative 'system/opensuse'
 
-require_relative 'system/cryptsetup'
+# require_relative 'system/cryptsetup'
 require_relative 'system/fstab'
 
 module DanarchyDeploy
   module System
     def self.new(deployment, options)
       abort('Operating System not defined! Exiting!') if !deployment[:os]
-      return deployment if ! deployment[:system]
       puts "\n" + self.name
 
       installer, updater, cleaner = prep_operating_system(deployment, options)
-      install_result = nil
-      if deployment[:packages] && !deployment[:packages].empty?
+      install_result, updater_result = nil, nil
+
+      puts "\n > Package Installation"
+      if [true, 'all', 'selected', nil].include?(deployment[:system][:update]) &&
+         deployment[:packages].any?
         packages = deployment[:packages].join(' ')
-        puts "\nInstalling packages..."
+        puts "\n   - Installing packages..."
         install_result = DanarchyDeploy::Helpers.run_command("#{installer} #{packages}", options)
         puts install_result[:stdout] if install_result[:stdout]
       else
-        puts "\nNo packages to install."
+        puts "\n   - Not installing packages."
+        puts "       |_ Packages selected: #{deployment[:packages].count}"
+        puts "       |_ Updates  selected: #{deployment[:system][:update]}"
       end
 
-      if !options[:pretend]
-        puts "\nRunning system updates..."
+      puts "\n > #{deployment[:os].capitalize} System Updates"
+      if [true, 'all', 'system', nil].include?(deployment[:system][:update])
+        puts "\n   - Running system updates..."
         updater_result = DanarchyDeploy::Helpers.run_command(updater, options)
         puts updater_result[:stdout] if updater_result[:stdout]
-        puts "\nCleaning up unused packages..."
+      else
+        puts "\n   - Not running #{deployment[:os].capitalize} system updates."
+        puts "       |_ Updates selected: #{deployment[:system][:update]}"
+      end
+
+      if install_result || updater_result
+        puts "\n   - Cleaning up unused packages..."
         cleanup_result = DanarchyDeploy::Helpers.run_command(cleaner, options)
         puts cleanup_result[:stdout] if cleanup_result[:stdout]
       end
@@ -52,7 +63,8 @@ module DanarchyDeploy
           DanarchyDeploy::Templater.new(deployment[:system][:templates], options)
         end
 
-        DanarchyDeploy::System::Cryptsetup.new(deployment[:os], deployment[:system][:cryptsetup], options)
+        # Disabled due to Init changes; re-writing and splitting LVM/CryptSetup
+        # DanarchyDeploy::System::Cryptsetup.new(deployment[:os], deployment[:system][:cryptsetup], options)
 
         if deployment[:system][:fstab]
           DanarchyDeploy::System::Fstab.new(deployment[:os], deployment[:system][:fstab], options)

data/lib/danarchy_deploy/templater.rb

@@ -3,6 +3,15 @@ require 'fileutils'
 
 module DanarchyDeploy
   class Templater
+    def self.load_source(source)
+      if source =~ /^builtin::/
+        source = File.expand_path('../../',  __dir__) + '/templates/' + source.split('::').last
+      end
+
+      abort("Source file does not exist at: #{source}") if ! File.exist?(source)
+      source
+    end
+
     def self.new(templates, options)
       puts "\n" + self.name
 
@@ -13,12 +22,17 @@ module DanarchyDeploy
 
       templates.each do |template|
         next if template[:remove]
-        abort("No target destination set for template: #{template[:source]}!") if !template[:target]
-        abort("No source or data for template: #{template[:target]}") if !template[:source] && !template[:data]
-        abort("Source file does not exist at: #{template[:source]}") if ! File.exist?(template[:source])
+        source = if !template[:target]
+                   abort("No target destination set for template: #{template[:source]}!")
+                 elsif template[:source].nil? && template[:data].nil?
+                   abort("No source or data for template: #{template[:target]}")
+                 elsif template[:data]
+                   '-- encoded data --'
+                 else
+                   load_source(template[:source])
+                 end
 
         target = template[:target]
-        source = template[:source] || '-- encoded data --'
         dir_perms = template[:dir_perms]
         file_perms = template[:file_perms]
         @variables = template[:variables] || nil
@@ -43,7 +57,11 @@ module DanarchyDeploy
         end
 
         File.open(tmpfile, 'w') do |f|
-          result = ERB.new(File.read(source), nil, '-').result(binding)
+          result = if RUBY_VERSION >= '2.6'
+                     ERB.new(File.read(source), trim_mode: '-').result(binding)
+                   else
+                     ERB.new(File.read(source), nil, '-').result(binding)
+                   end
           f.write(result)
           f.close
         end
@@ -54,7 +72,7 @@ module DanarchyDeploy
           puts "\n    - Fake Run: Not changing '#{target}'."
           result[:verify_permissions][File.dirname(tmpfile)] = verify_permissions(File.dirname(tmpfile), dir_perms, options)
           result[:verify_permissions][tmpfile] = verify_permissions(tmpfile, file_perms, options)
-        elsif md5sum(target,tmpfile) == true
+        elsif files_identical?(target,tmpfile)
           puts "\n    - No change in '#{target}': Nothing to update here."
           result[:verify_permissions][File.dirname(target)] = verify_permissions(File.dirname(target), dir_perms, options)
           result[:verify_permissions][target] = verify_permissions(target, file_perms, options)
@@ -77,13 +95,12 @@ module DanarchyDeploy
       chmod = nil
       puts "\n >  Verifying ownership and permissions for '#{target}'"
       if perms
-        puts "    |+ Setting file mode to: #{perms[:mode]}"
         (owner, group, mode) = perms[:owner], perms[:group], perms[:mode]
       else
         if File.stat(target).mode & 07777 == '0777'.to_i(8)
           puts "     ! '#{target}' has 0777 permissions! Setting those to something more sane."
           if File.ftype(target) == 'directory'
-            puts "    |+ Setting file mode to: 0775"
+            puts "    |+ Setting directory mode to: 0775"
             chmod = File.chmod(0775, target) ? true : false if !options[:pretend]
           elsif  File.ftype(target) == 'file'
             puts "    |+ Setting file mode to: 0644"
@@ -141,7 +158,7 @@ module DanarchyDeploy
       [owner, uid, group, gid]
     end
 
-    def self.md5sum(target, tmpfile)
+    def self.files_identical?(target, tmpfile)
       if File.exist?(target) && File.exist?(tmpfile)
         FileUtils.identical?(target, tmpfile)
       elsif File.exist?(target) && !File.exist?(tmpfile)