danarchy_deploy 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e103704d84bcb50319a7f6dae091e4655159c1ee83e0b28ae599280ab1c325d
-  data.tar.gz: '084b77c73e50c58af4f38d8cd81be5cdbbcd6923a046b944f3b1c3eafaacb248'
+  metadata.gz: 637fb3a1e9810606d864cbc0acab785194ce1fd101c1d74b1135cda4cf489229
+  data.tar.gz: 8886abdb6002348b7fe4fe1d9b27e90766bfd568b30513d246460b2c2dadd188
 SHA512:
-  metadata.gz: b24d195152bfd8ce9e63e946d393f6699c56914e6880b431e5ab93b4c557a292b73f3c6a5c6d21fa35fd3cf70f531daced888e1192bea86f0bcef6947e571b9e
-  data.tar.gz: bcf97212adde19fbb712efb9b9864e1f8f26e22370ed5fd0ff435ea1a04cd065d78b9530ee1b2989afd2aadc4c72eeecbdfc67f52b698dd08af0d7ee5d1be930
+  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,12 @@
+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

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,7 +3,7 @@ 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
@@ -13,10 +13,11 @@ module DanarchyDeploy
       puts "\n" + self.name
 
       installer, updater, cleaner = prep_operating_system(deployment, options)
-      install_result = nil
+      install_result, updater_result = nil, nil
 
       puts "\n > Package Installation"
-      if deployment[:packages].any? && ['all', 'packages', nil].include?(deployment[:system][:update])
+      if [true, 'all', 'selected', nil].include?(deployment[:system][:update]) &&
+         deployment[:packages].any?
         packages = deployment[:packages].join(' ')
         puts "\n   - Installing packages..."
         install_result = DanarchyDeploy::Helpers.run_command("#{installer} #{packages}", options)
@@ -28,18 +29,21 @@ module DanarchyDeploy
       end
 
       puts "\n > #{deployment[:os].capitalize} System Updates"
-      if ['all', 'system', nil].include?(deployment[:system][:update])
+      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 "\n   - Cleaning up unused packages..."
-        cleanup_result = DanarchyDeploy::Helpers.run_command(cleaner, options)
-        puts cleanup_result[:stdout] if cleanup_result[:stdout]
       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
+
       deployment
     end
 
@@ -59,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

@@ -95,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"

data/lib/danarchy_deploy/users.rb

@@ -8,6 +8,7 @@ module DanarchyDeploy
 
       deployment[:users].each do |username, user|
         user[:username] = username.to_s
+        user[:home]   ||= '/home/' + username.to_s
         puts "\n > Checking if user '#{user[:username]}' already exists."
         usercheck_result = usercheck(user, options)
 
@@ -15,8 +16,8 @@ module DanarchyDeploy
           puts "   - User: #{user[:username]} already exists!"
         else
           group = { groupname: user[:username] }
-          group[:gid] = user[:gid] ? user[:gid] : nil
-          group[:system] = user[:system] ? user[:system] : nil
+          group[:gid]    = user[:gid]    || nil
+          group[:system] = user[:system] || nil
 
           groupcheck_result = DanarchyDeploy::Groups.groupcheck(group, options)
           if !groupcheck_result[:stdout] && group[:gid]
@@ -40,12 +41,12 @@ module DanarchyDeploy
 
           if user[:authorized_keys]
             puts "\n > Checking on #{user[:authorized_keys].count} authorized_keys for user: #{user[:username]}"
-            authorized_keys(user)
+            authorized_keys(user, options)
           end
           
           if user[:sudoer]
             puts "\n > Checking sudo rules for user: #{user[:username]}"
-            sudoer(user)
+            sudoer(user, options)
           end
         end
 
@@ -63,13 +64,13 @@ module DanarchyDeploy
     private
     def self.useradd(user, options)
       useradd_cmd  = "useradd #{user[:username]} "
-      useradd_cmd += "--home-dir #{user[:home]} " if user[:home]
-      useradd_cmd += "--create-home " if !Dir.exist?(user[:home])
-      useradd_cmd += "--uid #{user[:uid]} " if user[:uid]
-      useradd_cmd += "--gid #{user[:gid]} " if user[:gid]
+      useradd_cmd += "--home-dir #{user[:home]} "           if user[:home]
+      useradd_cmd += "--create-home "                       if ! Dir.exist?(user[:home])
+      useradd_cmd += "--uid #{user[:uid]} "                 if user[:uid]
+      useradd_cmd += "--gid #{user[:gid]} "                 if user[:gid]
       useradd_cmd += "--groups #{user[:groups].join(',')} " if user[:groups]
-      useradd_cmd += "--shell /sbin/nologin " if user[:nologin]
-      useradd_cmd += "--system " if user[:system]
+      useradd_cmd += "--shell /sbin/nologin "               if user[:nologin]
+      useradd_cmd += "--system "                            if user[:system]
       DanarchyDeploy::Helpers.run_command(useradd_cmd, options)
     end
 
@@ -111,40 +112,47 @@ module DanarchyDeploy
       DanarchyDeploy::Helpers.run_command(removegroup_cmd, options)
     end
 
-    def self.authorized_keys(user)
-      ssh_path = user[:home] + '/.ssh'
-      authkeys = ssh_path + '/authorized_keys'
-
-      Dir.exist?(ssh_path) || Dir.mkdir(ssh_path, 0700)
-      File.chown(user[:uid], user[:gid], ssh_path)
-      File.open(authkeys, 'a+') do |f|
-        contents = f.read
-        user[:authorized_keys].each do |authkey|
-          if contents.include?(authkey)
-            puts "   - Key already in place: #{authkey}"
-          else
-            puts "   + Adding authorized_key: #{authkey}"
-            f.puts authkey
-          end
-        end
-
-        f.chown(user[:uid], user[:gid])
-        f.close
-      end
+    def self.authorized_keys(user, options)
+      templates = [
+        {
+          source: 'builtin::system/authorized_keys.erb',
+          target: user[:home] + '/.ssh/authorized_keys',
+          dir_perms: {
+            owner: user[:username],
+            group: user[:username],
+            mode:  '0700'
+          },
+          file_perms: {
+            owner: user[:username],
+            group: user[:username],
+            mode:  '0644'
+          },
+          variables: {
+            authorized_keys: user[:authorized_keys]
+          }
+        }
+      ]
+
+      DanarchyDeploy::Templater.new(templates, options)
     end
 
-    def self.sudoer(user)
-      sudoer_file = '/etc/sudoers.d/danarchy_deploy-' + user[:username]
-      File.open(sudoer_file, 'a+') do |f|
-        if !f.read.include?(user[:sudoer])
-          puts "   |+ Added: '#{user[:sudoer]}'"
-          f.puts user[:sudoer]
-        else
-          puts '   - No change needed'
-        end
-
-        f.close
-      end
+    def self.sudoer(user, options)
+      templates = [
+        {
+          source: 'builtin::system/sudoers.erb',
+          target: '/etc/sudoers.d/danarchy_deploy-' + user[:username],
+          file_perms: {
+            owner: 'root',
+            group: 'root',
+            mode: '0440'
+          },
+          variables: {
+            rules: user[:sudoer]
+          }
+        }
+      ]
+
+      DanarchyDeploy::Templater.new(templates, options)
     end
   end
 end

data/lib/danarchy_deploy/version.rb

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