danarchy_deploy 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f00a848b7b3326a27f07e661d2a0f79593cd8bb4140664e7fd86de1429a428a5
-  data.tar.gz: 91d62fdeff9560e8178bfe00b214c15740d53f785003f33a38d10c22878e5be5
+  metadata.gz: d4665ec27120f6fda4337da5a2b2cb465511534cef96b47c2a11791076012f64
+  data.tar.gz: e12104840e0273bf38d37a0465752ebc5bacc53d2d0f4a5b5783a936f5810afb
 SHA512:
-  metadata.gz: afb687e9d4df549f12bb3d14d6acf235020d288617ceba418eee50d7806da84d002491b1beb62056484a71e047aa91cac02b40d60afe7b8a073980550dc52af9
-  data.tar.gz: 8db9fa38eaedc05cc48074a690176764be983cdf9b18538773ee63d55de1c039a835f3c962df23d6970b725a0299cee9ea81f3aaee0e02c3244451caf46d6552
+  metadata.gz: 4bc766ba4a3e8f6e0e691dd1904029f9c08cd6b040146214ae31fb0c18b3a779bae3258b033b1b50205f70c02ebfdbc1fcdd5756ae5ef7b727ce8225397cb4b4
+  data.tar.gz: 7b22f9218392944730cec707bbf62cf9cc9c696fd411eccf02e6d7ceff54748b141c76b2b3de6750867287e9221a17f0be08be524a29c58e14b38b6741da4036

data/.ruby-gemset

@@ -0,0 +1 @@
+danarchy_deploy

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.7.2

data/CHANGELOG.md

@@ -0,0 +1,48 @@
+patch_0.2.6
+- DanarchyDeploy: gem install --bindir
+- DanarchyDeploy: return from each class if not defined in a deployment
+- Services::MySQL: Check for defaults_file instead of /etc/my.cnf, SecureRandom.hex for passwords
+- Services::Init: clean up output and if statement
+- Add RVM .ruby-version .ruby-gemset
+- Rename danarchy_deploy-console to console-dd
+- Add CHANGELOG.md
+
+patch_0.2.5
+- Adds Fstab system service
+- Adds Dmcrypt/LVM system service
+- Enforce MongoDB security/limits.d/mongodb.conf if it doesn't exist
+- Clarify some CLI output
+- Ignore first SSH known_hosts error in RemoteDeploy.remote_mkdir
+
+patch_0.2.4
+- mongodb limits newlines
+
+patch_0.2.2
+- Fix MongoDB so it correctly applies security limits file count
+
+release_0.2.0
+- Adds Applicator #wordpress #nginx #phpfpm #ssl
+- Adds Services #init #mongodb #mysql
+- Adds System #centos #debian #gentoo #openssue
+
+patch_0.1.6
+- User/Groups commands should use sudo
+
+patch_0.1.5
+- Don't upload to couchdb if using a .json/.yaml template
+
+patch_0.1.4
+- sudoers.d/ file root owned
+
+patch_0.1.3
+- prevents packages from being an empty array
+
+patch_0.1.2
+- chown/chmod on ~/.ssh contents
+- fix JSON parse error
+
+release_0.1.1
+- Re-order archive extraction and template creation so that written templates aren't overwritten by archive data.
+- Fixes user sudoers.d file creation; a+ append instead of r+ read-write (expects file to exist already).
+- Cleans up package handling for Gentoo and also changes --usepkg to --buildpkg if hostname begins with 'image' or 'template' for binary creation during image builds.
+

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    danarchy_deploy (0.2.5)
+    danarchy_deploy (0.2.6)
       danarchy_couchdb (~> 0.1)
       mongo (~> 2.17)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bson (4.14.0)
+    bson (4.14.1)
     danarchy_couchdb (0.1.3)
     mongo (2.17.0)
       bson (>= 4.8.2, < 5.0.0)
@@ -23,4 +23,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.3.3
+   2.3.9

data/bin/danarchy_deploy

@@ -95,7 +95,7 @@ end
 if location == 'remote'
   deployment = DanarchyDeploy::RemoteDeploy.new(deployment, options)
 elsif location == 'local'
-  abort('Exiting! Local deployment be run with sudo!') if Process.uid != 0
+  abort('Exiting! Local deployment must be run with sudo!') if Process.uid != 0
   puts "Deploying #{deployment[:hostname]} locally to #{`hostname`.chomp}."
 
   if !options[:pretend]

data/lib/danarchy_deploy/groups.rb

@@ -2,6 +2,7 @@
 module DanarchyDeploy
   class Groups
     def self.new(deployment, options)
+      return deployment if ! deployment[:groups]
       puts "\n" + self.name
       (groupadd_result, groupdel_result) = nil
 

data/lib/danarchy_deploy/services/init.rb

@@ -5,6 +5,7 @@ module DanarchyDeploy
   module Services
     class Init
       def self.new(deployment, options)
+        return deployment if ! deployment[:services]
         puts "\n" + self.name
 
         deployment[:services].each do |service, params|
@@ -35,16 +36,16 @@ module DanarchyDeploy
 
         init_result = init.send(action)
 
-        if init_result[:stderr]
-          if init_result[:stderr].include?('unknown function')
+        if stderr = init_result[:stderr]
+          if stderr.include?('unknown function')
             puts "       ! Action: #{action} not available for service: #{service}.\n" +
                  "          ! A restart may be needed! Otherwise, remove this action from the deployment.\n" +
                  "          ! Not taking any action here.\n"
           else
-            abort("       ! Action: #{service} #{action} failed!")
+            abort("       ! Action: #{action} #{service} failed!")
           end
         else
-          puts "       |+ Action: #{service} #{action} succeeded."
+          puts "       |+ Action: #{action} #{service} succeeded."
         end
       end
     end

data/lib/danarchy_deploy/services/mongodb.rb

@@ -13,7 +13,7 @@ module DanarchyDeploy
         Mongo::Logger.logger.level = Logger::FATAL
         mongodb_conf, updated_conf = self.load_mongodb_conf
         host_port = mongodb_conf['net']['bindIp'].split(',').first + ':' + mongodb_conf['net']['port'].to_s
-        admin_user, new_admin   = self.load_admin_user
+        admin_user, new_admin = self.load_admin_user
 
         if new_admin == true
           client = Mongo::Client.new(['127.0.0.1'], database: 'admin')

data/lib/danarchy_deploy/services/mysql/new_server.rb

@@ -49,13 +49,13 @@ module DanarchyDeploy
         end
 
         def self.generate_root_mycnf(mysql, options)
-          return if File.exist?(mysql[:default_file])
-          puts "   |+ Generating #{mysql[:default_file]} file."
-          password = SecureRandom.base64(14)
+          return if File.exist?(mysql[:defaults_file])
+          puts "   |+ Generating #{mysql[:defaults_file]} file."
+          password = SecureRandom.hex(24)
           source = options[:deploy_dir] +
                    '/templates/services/mysql/root_my.cnf.erb'
 
-          templates = [{ target: mysql[:default_file],
+          templates = [{ target: mysql[:defaults_file],
                          source: source,
                          variables: {
                            host: 'localhost',

data/lib/danarchy_deploy/services/mysql.rb

@@ -11,7 +11,7 @@ module DanarchyDeploy
         mysql = self.set_parameters(mysql)
         self.generate_my_cnf(mysql, options)
 
-        if File.exist?(mysql[:my_cnf]) && Dir.exist?(mysql[:datadir] + '/mysql')
+        if File.exist?(mysql[:defaults_file]) && Dir.exist?(mysql[:datadir])
           puts "   |+ Using existing MySQL service."
         else
           MySQL::NewServer.new(os, mysql, options)
@@ -24,8 +24,8 @@ module DanarchyDeploy
       end
 
       def self.set_parameters(mysql)
-        mysql[:default_file] = mysql[:default_file] ?
-                                 mysql[:default_file] :
+        mysql[:defaults_file] = mysql[:defaults_file] ?
+                                 mysql[:defaults_file] :
                                  '/root/.my.cnf'
         mysql[:my_cnf] = mysql[:my_cnf] ?
                            mysql[:my_cnf] :

data/lib/danarchy_deploy/services.rb

@@ -6,6 +6,7 @@ require_relative 'services/mysql'
 module DanarchyDeploy
   module Services
     def self.new(deployment, options)
+      return deployment if ! deployment[:services]
       puts "\n" + self.name
 
       deployment[:services].each do |service, params|

data/lib/danarchy_deploy/system/cryptsetup.rb

@@ -6,10 +6,14 @@ module DanarchyDeploy
         return false if cryptsetup.nil?
         puts "\n" + self.name
 
-        # expects object: { "cryptsetup": { "source": "/danarchy/deploy/templates/system/cryptsetup.erb", (optional)
-        #                                "volumes": { "vg_name:vg0:/dev/vdb": { "target": "dm-vg0-mongodb",
-        #                                                               "source": "/dev/mapper/vg0-mongodb",
-        #                                                               "key": "/root/vdb_mongodb.key" } } } }
+        # expects object: {
+        # "cryptsetup": {
+        #       "source": "/danarchy/deploy/templates/system/cryptsetup.erb", (optional)
+        #       "volumes": {
+        #               "vg_name:vg0:/dev/vdb": {
+        #                       "target": "dm-vg0-mongodb",
+        #                       "source": "/dev/mapper/vg0-mongodb",
+        #                       "key": "/root/vdb_mongodb.key" } } } }
 
         if os == 'gentoo'
           DanarchyDeploy::Services::Init.init_manager(os, 'lvmetad', 'enable', options)

data/lib/danarchy_deploy/system/fstab.rb

@@ -10,6 +10,12 @@ module DanarchyDeploy
         mount_all(options)
       end
 
+      def self.mount_all(options)
+        puts "\n > Mounting Filesystems"
+        mount_result = DanarchyDeploy::Helpers.run_command('mount -a', options)
+        abort('    ! Failed to mount filesystems!') if mount_result[:stderr]
+      end
+
       private
       def self.set_config(fstab, options)
         target = '/etc/fstab'
@@ -49,12 +55,6 @@ module DanarchyDeploy
                                                    !Dir.exist?(mount[:mountpoint])
         end
       end
-
-      def self.mount_all(options)
-        puts "\n > Mounting Filesystems"
-        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/system.rb

@@ -10,6 +10,7 @@ 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)
@@ -32,8 +33,6 @@ module DanarchyDeploy
         puts cleanup_result[:stdout] if cleanup_result[:stdout]
       end
 
-      DanarchyDeploy::System::Cryptsetup.new(deployment[:os], deployment[:system][:cryptsetup], options)
-      DanarchyDeploy::System::Fstab.new(deployment[:os], deployment[:system][:fstab], options)
       deployment
     end
 
@@ -52,6 +51,14 @@ module DanarchyDeploy
           puts "\n > Configuring system templates for #{deployment[:os]}"
           DanarchyDeploy::Templater.new(deployment[:system][:templates], options)
         end
+
+        DanarchyDeploy::System::Cryptsetup.new(deployment[:os], deployment[:system][:cryptsetup], options)
+
+        if deployment[:system][:fstab]
+          DanarchyDeploy::System::Fstab.new(deployment[:os], deployment[:system][:fstab], options)
+        else
+          DanarchyDeploy::System::Fstab.mount_all(options)
+        end
       end
 
       if os.downcase == 'gentoo'
@@ -61,8 +68,8 @@ module DanarchyDeploy
       elsif os.downcase == 'opensuse'
         puts 'OpenSUSE is not fully supported yet!'
         (installer, updater, cleaner) = DanarchyDeploy::System::OpenSUSE.new(deployment, options)
-      elsif %w[centos redhat].include?(os.downcase)
-        puts 'CentOS/RedHat is not fully supported yet!'
+      elsif %w[fedora centos redhat].include?(os.downcase)
+        puts 'Fedora/CentOS/RedHat is not fully supported yet!'
         (installer, updater, cleaner) = DanarchyDeploy::System::CentOS.new(deployment, options)
       end
 

data/lib/danarchy_deploy/users.rb

@@ -2,6 +2,7 @@
 module DanarchyDeploy
   class Users
     def self.new(deployment, options)
+      return deployment if ! deployment[:users]
       puts "\n" + self.name
       (useradd_result, userdel_result, archives_result) = nil
 
@@ -56,7 +57,6 @@ module DanarchyDeploy
         user.delete(:username)
       end
 
-      # [useradd_result, userdel_result]
       deployment
     end
 

data/lib/danarchy_deploy/version.rb

@@ -1,3 +1,3 @@
 module DanarchyDeploy
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/danarchy_deploy.rb

@@ -21,10 +21,10 @@ module DanarchyDeploy
       printf("%12s %0s\n", 'Packages:', deployment[:packages].join(', '))  if deployment[:packages]
 
       deployment = DanarchyDeploy::System.new(deployment, options)
-      deployment = DanarchyDeploy::Services.new(deployment, options)       if deployment[:services]
-      deployment = DanarchyDeploy::Groups.new(deployment, options)         if deployment[:groups]
-      deployment = DanarchyDeploy::Users.new(deployment, options)          if deployment[:users]
-      deployment = DanarchyDeploy::Services::Init.new(deployment, options) if deployment[:services]
+      deployment = DanarchyDeploy::Services.new(deployment, options)
+      deployment = DanarchyDeploy::Groups.new(deployment, options)
+      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")
       puts "\nFinished Local Deployment at #{deployment[:last_deploy]}!"
@@ -61,7 +61,7 @@ module DanarchyDeploy
 
       gem_clean(connector, options)
       gem_binary = _locate_gem_binary(connector, options) # this should run before any install; check version too
-      push_temmplates(connector, options)
+      push_templates(connector, options)
       push_deployment(connector, options)
       deploy_result = remote_LocalDeploy(connector, gem_binary, options)
 
@@ -144,7 +144,7 @@ module DanarchyDeploy
       end
       
       puts "\n > Installing gem: #{gem} on #{connector[:hostname]}"
-      install_cmd = _ssh_command(connector, "sudo gem install -f #{options[:deploy_dir]}/#{File.basename(gem)}")
+      install_cmd = _ssh_command(connector, "sudo gem install --bindir /usr/local/bin -f #{options[:deploy_dir]}/#{File.basename(gem)}")
       install_result = DanarchyDeploy::Helpers.run_command(install_cmd, options)
 
       if install_result[:stderr]
@@ -159,7 +159,7 @@ module DanarchyDeploy
       system(clean_cmd)
     end
 
-    def self.push_temmplates(connector, options)
+    def self.push_templates(connector, options)
       template_dir = options[:deploy_dir] + '/templates'
       puts "\n > Pushing templates: #{template_dir}"
       push_cmd = _rsync_push(connector, template_dir, template_dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Dan James
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danarchy_couchdb
@@ -71,22 +71,25 @@ description: DanarchyDeploy intends to simplify Gentoo Linux (and other distro)
 email:
 - dan@danarchy.me
 executables:
+- console-dd
 - danarchy_deploy
-- danarchy_deploy-console
 - setup
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console-dd
 - bin/danarchy_deploy
-- bin/danarchy_deploy-console
 - bin/setup
 - danarchy_deploy.gemspec
 - lib/danarchy_deploy.rb
@@ -144,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Pushes deployments locally or remotely based on a JSON/YAML/CouchDB template.