danarchy_deploy 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf92e113ddbc42b8b0ce95baf0a4fe1652d1f51e66c749ef1b073c38f92deb83
-  data.tar.gz: 9badea3a6da5ccec2d5f3c481211533abc3a46b53493611b4c945905e6f960ae
+  metadata.gz: d983a99ae7625895008802d7aefb21d055f45e3b70dfd365ca2881d2349a29d6
+  data.tar.gz: 55d5b7477a5d2b43bcffe6d86d11977add6739e49336cd963fde8141b374f13a
 SHA512:
-  metadata.gz: 97ff0fee694f105fe796e0be5e73b40e44fe9aff9f63b28e4aff327bfcae4573420f90ea92e3b93bbc8f168abb4e0ab1a3dcfb532e2ef9ab0b99e15f5fde82ba
-  data.tar.gz: 43ce70a9b2d80697feaaee119ebbb5dbe93f6e2270fb381718ccef0a97f29dd041fa80c54372119a14553f748e76b632a86e8dacb48eac14c76faacd54f0dfa5
+  metadata.gz: 4b42720a0e7433080ff22b9104bde15f347ba6fea32e405a37dc122c46527c27a0e022da4242ff4f44d3e810c82834aa745eb0df9673c4642901da7c726a5e4b
+  data.tar.gz: 8f0aab58a7132063b3383f9a4a7b310f2dc5fb026f15f0b7850325864098bac55900c1c6e0aacd8e628e620efcc593fdb4e3b26f25ad1741803f38bca41507eb

data/.asdf_versions.json

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

data/.tool-versions

@@ -1 +1 @@
-ruby 3.2.2
+ruby 3.2.4

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+patch_0.2.12
+- Rename bin/console
+- Change emerge --sync cron to /etc/cron.daily/
+- Init::OpenRC: cleanup service in wrong runlevels
+- add skip_install option
+
+patch_0.2.11
+- gentoo: fix portage cron permissions
+- restructure bin/exe dirs, update gemspec
+- cleanup emerge --sync tmpdir on failure
+
 patch_0.2.10
 - fix set_hostname in debian, centos, opensuse
 

data/{bin → exe}/danarchy_deploy

@@ -4,13 +4,16 @@ require 'danarchy_couchdb'
 require 'optparse'
 
 deployment = nil
-options = { couchdb: "#{ENV['HOME']}/.danarchy/danarchy_deploy/danarchy_couchdb.json",
-            deploy_dir: '/danarchy/deploy',
-            deploy_file: nil,
-            first_run: false,
-            pretend: false,
-            ssh_verbose: false,
-            vars_verbose: false }
+options = {
+  couchdb: "#{ENV['HOME']}/.danarchy/danarchy_deploy/danarchy_couchdb.json",
+  deploy_dir: '/danarchy/deploy',
+  deploy_file: nil,
+  first_run: false,
+  pretend: false,
+  ssh_verbose: false,
+  vars_verbose: false,
+  skip_install: false
+}
 
 ARGV.push('--help') if ARGV.empty?
 optparse = OptionParser.new do |opts|
@@ -53,6 +56,10 @@ optparse = OptionParser.new do |opts|
     options[:vars_verbose] = true
   end
 
+  opts.on('--skip-install', "Skip package installation and updates.") do |val|
+    options[:skip_install] = true
+  end
+
   opts.on('--version', "Print #{$PROGRAM_NAME} version.") do |val|
     puts "DanarchyDeploy: #{DanarchyDeploy::VERSION}"
     exit 1
@@ -101,7 +108,7 @@ elsif location == 'local'
     puts ' ! Ctrl-c out if this is not what you want to do!'
     10.downto(0) do |i|
       trap('SIGINT') { abort("\nExiting!") }
-      print "\rDeploying in #{i} seconds"
+      print "\rDeploying in #{i} seconds. "
       sleep(1)
     end
 

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

@@ -3,10 +3,11 @@ module DanarchyDeploy
   module Services
     class Init
       class Openrc
-        def initialize(service, runlevel, options)
+        def initialize(service, runlevel='default', options)
           @service  = service
           @runlevel = runlevel
           @options  = options
+          cleanup_runlevels
         end
 
         def status
@@ -64,10 +65,19 @@ module DanarchyDeploy
         end
 
         def disable
-          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)
+          cmd = "rc-update del #{@service} #{runlevel}"
+          DanarchyDeploy::Helpers.run_command(cmd, @options)
+        end
+
+        private
+        def cleanup_runlevels
+          Dir["/etc/runlevels/*/#{@service}"].each do |dir|
+            runlevel = File.basename(File.dirname(dir))
+            if runlevel != @runlevel
+              puts "    |> Removing #{@service} from wrong runlevel: #{runlevel}"
+              cmd = "rc-update del #{@service} #{runlevel}"
+              DanarchyDeploy::Helpers.run_command(cmd, @options)
+            end
           end
         end
       end

data/lib/danarchy_deploy/system/bsd.rb

@@ -0,0 +1,24 @@
+
+module DanarchyDeploy
+  module System
+    class BSD
+      def self.new(deployment, options)
+        puts "\n" + self.name
+        puts 'BSD detected! Using pkg.'
+
+        set_hostname(deployment[:hostname]) if !options[:pretend]
+        installer = 'pkg install -y '
+        update    = 'pkg upgrade -y '
+        cleaner   = 'pkg clean -y '
+
+        puts "\n Updating Pkg repos..."
+        DanarchyDeploy::Helpers.run_command('pkg update -q',options)
+        [installer, updater, cleaner]
+      end
+
+      private
+      def self.set_hostname(hostname)
+        `hostname #{hostname}`
+      end
+    end
+end

data/lib/danarchy_deploy/system/fstab.rb

@@ -47,8 +47,8 @@ module DanarchyDeploy
             abort("    ! Failed to run mkfs: #{mkfs[:stderr]}") if mkfs[:stderr]
           end
 
-          FileUtils.mkdir_p(mount[:mountpoint]) if !options[:pretend] &&
-                                                   !Dir.exist?(mount[:mountpoint])
+          FileUtils.mkdir_p(mount[:mountpoint]) unless options[:pretend] &&
+                                                       Dir.exist?(mount[:mountpoint])
         end
       end
 

data/lib/danarchy_deploy/system/gentoo.rb

@@ -37,8 +37,8 @@ module DanarchyDeploy
 
       private
       def self.emerge_sync_in_progress
-        repo_path = `emerge --info | grep location`.chomp.split(': ').last
-        Dir.exist?(repo_path + '/.tmp-unverified-download-quarantine')
+        @repo_path = `emerge --info | grep location`.chomp.split(': ').last
+        Dir.exist?(@repo_path + '/.tmp-unverified-download-quarantine')
       end
 
       def self.emerge_sync_wait
@@ -48,7 +48,7 @@ module DanarchyDeploy
         puts "     |> Continuing with emerge!"
       end
 
-      def self.emerge_sync(sync, options)
+      def self.emerge_sync(sync=false, options)
         puts "\n >  Gentoo Emerge Sync"
         if sync.nil?
           install_sync_cron(sync, options)
@@ -57,8 +57,15 @@ module DanarchyDeploy
           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
+          begin
+            DanarchyDeploy::Helpers.run_command('emerge --sync &>/var/log/emerge-sync.log', options)
+          ensure
+            if Dir.exist?("#{@repo_path}/.tmp-unverified-download-quarantine")
+              puts "\n    ! emerge --sync may have failed: cleaning up tmp path."
+              DanarchyDeploy::Helpers.run_command("rm -rf #{@repo_path}/.tmp-unverified-download-quarantine", options)
+            end
+          end
+        elsif sync =~ /(cron|schedule)/i
           install_sync_cron(sync, options)
         else
           puts "\n   ! Unknown sync cron time: #{sync}. Not running emerge sync!"
@@ -75,50 +82,28 @@ module DanarchyDeploy
       end
 
       def self.install_sync_cron(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
+        templates = Array.new
+        if sync.nil? || sync == false
+          DanarchyDeploy::Helpers.run_command(
+            'id portage | grep cron >/dev/null && usermod -r -G cron portage',
+            options)
+
+          templates.push({ target: '/etc/cron.daily/portage_sync.sh',
+                           remove: true })
+        else
+          DanarchyDeploy::Helpers.run_command(
+            'id portage | grep cron >/dev/null || usermod -a -G cron portage',
+            options)
+
+          templates.push({ source: 'builtin::portage/portage_sync.sh',
+                           target: '/etc/cron.daily/portage_sync.sh',
+                           file_perms: {
+                             owner: 'root',
+                             group: 'root',
+                             mode: '0740'
+                           }
+                         })
+        end
 
         DanarchyDeploy::Templater.new(templates, options)
       end

data/lib/danarchy_deploy/system.rb

@@ -15,6 +15,11 @@ module DanarchyDeploy
       installer, updater, cleaner = prep_operating_system(deployment, options)
       install_result, updater_result = nil, nil
 
+      if options[:skip_install]
+        puts "\n > Skipping package installation due to --skip-install"
+        return deployment
+      end
+
       puts "\n > Package Installation"
       if [true, 'all', 'selected', nil].include?(deployment[:system][:update]) &&
          deployment[:packages].any?
@@ -87,23 +92,5 @@ module DanarchyDeploy
 
       [installer, updater, cleaner]
     end
-
-    def self.fstab_mount(deployment, options)
-      fstab = deployment[:system][:templates].collect { |t| t if t[:target] == '/etc/fstab' }.compact
-      fstab.each do |t|
-        t[:variables].each do |v|
-          if !Dir.exist?(v[:mountpoint])
-            puts "Creating mountpoint: #{v[:mountpoint]}"
-            FileUtils.mkdir_p(v[:mountpoint]) if !options[:pretend]
-          end
-        end
-      end
-
-      puts "\n > Mounting Filesystems"
-      if !options[:pretend]
-        mount_result = DanarchyDeploy::Helpers.run_command('mount -a', options)
-        abort('   |! Failed to mount filesystems!') if mount_result[:stderr]
-      end
-    end
   end
 end

data/lib/danarchy_deploy/version.rb

@@ -1,3 +1,3 @@
 module DanarchyDeploy
-  VERSION = "0.2.10"
+  VERSION = "0.2.12"
 end

data/templates/deploy_template.json

@@ -24,7 +24,7 @@
     }
   },
   "portage": {
-    "sync": false,
+    "sync": false || false || "cron || schedule",
     "templates": [
       {
         "target": "/etc/portage/make.conf",
@@ -70,9 +70,10 @@
   "services": {
     "service_name": {
       "init": {
-        "service": [
+        "runlevel": "default",
+        "actions": [
           "enable",
-          "restart"
+          "start"
         ]
       },
       "archives": [

data/templates/portage/portage_sync.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+/usr/bin/emerge --sync &> /var/log/emerge-sync.log
+/usr/bin/eclean-dist
+/usr/bin/eclean-pkg

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - Dan James
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2025-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: danarchy_couchdb
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
+        version: '2.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: danarchy_couchdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
+        version: '0.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
@@ -66,32 +66,38 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.20'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: DanarchyDeploy intends to simplify Gentoo Linux (and other distro) deployments
   down to a single template from an input JSON or YAML file, or from a CouchDB file.
 email:
 - dan@danarchy.me
 executables:
-- console-dd
 - danarchy_deploy
-- setup-dd
 extensions: []
 extra_rdoc_files: []
 files:
 - ".asdf_versions.json"
-- ".gitignore"
 - ".rspec"
 - ".tool-versions"
 - ".travis.yml"
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console-dd
-- bin/danarchy_deploy
-- bin/setup-dd
-- danarchy_deploy.gemspec
+- exe/danarchy_deploy
 - lib/danarchy_deploy.rb
 - lib/danarchy_deploy/applicator.rb
 - lib/danarchy_deploy/applicator/nginx.rb
@@ -117,6 +123,7 @@ files:
 - lib/danarchy_deploy/services/mysql/new_server.rb
 - lib/danarchy_deploy/services/mysql/privileges.rb
 - lib/danarchy_deploy/system.rb
+- lib/danarchy_deploy/system/bsd.rb
 - lib/danarchy_deploy/system/centos.rb
 - lib/danarchy_deploy/system/cryptsetup.rb
 - lib/danarchy_deploy/system/debian.rb
@@ -138,6 +145,7 @@ files:
 - templates/portage/make.conf.erb
 - templates/portage/package.use/bindist
 - templates/portage/package.use/documentation
+- templates/portage/portage_sync.sh
 - templates/services/memcached/memcached.erb
 - templates/services/mysql/my.cnf.erb
 - templates/services/mysql/root_my.cnf.erb
@@ -180,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Pushes deployments locally or remotely based on a JSON/YAML/CouchDB template.

data/.gitignore

@@ -1,12 +0,0 @@
-*~
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-# git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in danarchy_deploy.gemspec
-gemspec

data/Gemfile.lock

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

data/bin/console-dd

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "danarchy_deploy"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup-dd

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/danarchy_deploy.gemspec

@@ -1,37 +0,0 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "danarchy_deploy/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "danarchy_deploy"
-  spec.version       = DanarchyDeploy::VERSION
-  spec.authors       = ["Dan James"]
-  spec.email         = ["dan@danarchy.me"]
-
-  spec.summary       = %q{Pushes deployments locally or remotely based on a JSON/YAML/CouchDB template.}
-  spec.description   = %q{DanarchyDeploy intends to simplify Gentoo Linux (and other distro) deployments down to a single template from an input JSON or YAML file, or from a CouchDB file.}
-  spec.homepage      = "https://github.com/danarchy85/danarchy_deploy"
-  spec.license       = "MIT"
-
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency 'danarchy_couchdb', '~> 0.1'
-
-  spec.add_development_dependency 'bundler', '~> 2.5'
-  spec.add_development_dependency 'rake', '~> 13.0'
-
-  spec.add_runtime_dependency 'mongo', '~> 2.20'
-end