danarchy_deploy 0.1.5 → 0.2.4

data/lib/danarchy_deploy/system/gentoo.rb

@@ -0,0 +1,66 @@
+
+module DanarchyDeploy
+  module System
+    class Gentoo
+      def self.new(deployment, options)
+        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
+
+        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")
+        installer += '--pretend ' if options[:pretend]
+
+        updater  = 'emerge --usepkg --buildpkg --update --deep --newuse --quiet --with-bdeps=y @world'
+        updater += ' --pretend' if options[:pretend]
+
+        cleaner  = 'emerge --depclean --quiet '
+        cleaner += '--pretend ' if options[:pretend]
+
+        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]
+        end
+
+        [installer, updater, cleaner]
+      end
+
+      private
+
+      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
+
+          f.close
+        end
+      end
+
+      def self.set_hostname(hostname)
+        confd_hostname = "hostname=\"#{hostname}\""
+        File.write('/etc/conf.d/hostname', confd_hostname)
+        `hostname #{hostname}`
+      end
+
+      def self.check_hostname(hostname)
+        `hostname`.chomp == hostname
+      end
+    end
+  end
+end

data/lib/danarchy_deploy/system/opensuse.rb

@@ -0,0 +1,22 @@
+
+module DanarchyDeploy
+  module System
+    class OpenSUSE
+      def self.new(deployment, options)
+        puts "\n" + self.name
+        puts "#{deployment[:os].capitalize} detected! Using zypper."
+
+        puts "Updating zypper repositories..."
+        DanarchyDeploy::Helpers.run_command('sudo zypper refresh', options)
+
+        installer = 'zypper install '
+        updater = 'zypper upgrade'
+        cleaner = nil
+        zypper_refresh_repos = DanarchyDeploy::Helpers.run_command('zypper refresh', options)
+        # Needs package checking & testing
+
+        [installer, updater, cleaner]
+      end
+    end
+  end
+end

data/lib/danarchy_deploy/templater.rb

@@ -6,10 +6,17 @@ module DanarchyDeploy
     def self.new(templates, options)
       puts "\n" + self.name
 
+      if templates.map(&:keys).flatten.include?(:remove)
+        puts ' > Removing templates tagged for removal.'
+        templates = remove_templates(templates, options)
+      end
+
       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])
+
         target = template[:target]
         source = template[:source] || '-- encoded data --'
         dir_perms = template[:dir_perms]
@@ -19,12 +26,13 @@ module DanarchyDeploy
         puts "    Source:   #{source}"
         puts "    |> Dir  Permissions: #{dir_perms || '--undefined--'}"
         puts "    |> File Permissions: #{file_perms || '--undefined--'}"
-        puts "    |> Variables: #{@variables}" if @variables
+        if options[:vars_verbose] && @variables
+          puts '    |> Variables: '
+          var = DanarchyDeploy::Helpers.hash_except(@variables, '^pass')
+          puts var
+        end
 
-        targetdir = File.dirname(target)
         tmpdir = options[:deploy_dir] + '/' + File.basename(File.dirname(target))
-        p tmpdir
-        Dir.exist?(targetdir) || FileUtils.mkdir_p(targetdir, mode: 0755)
         Dir.exist?(tmpdir) || FileUtils.mkdir_p(tmpdir, mode: 0755)
         tmpfile = tmpdir + '/' + File.basename(target) + '.tmp'
 
@@ -35,25 +43,25 @@ module DanarchyDeploy
         end
 
         File.open(tmpfile, 'w') do |f|
-          result = ERB.new(File.read(source)).result(binding)
+          result = ERB.new(File.read(source), nil, '-').result(binding)
           f.write(result)
           f.close
         end
 
         result = { write_erb: [], verify_permissions: {} }
         if options[:pretend]
-          diff(target, tmpfile)
-          puts "\n   - Fake Run: Not changing '#{target}'."
+          diff(target, tmpfile) if options[:vars_verbose]
+          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
-          puts "\n   - No change in '#{target}': Nothing to update here."
+          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)
         else
-          diff(target, tmpfile)
+          diff(target, tmpfile) if options[:vars_verbose]
           result[:write_erb] = enable_erb(target, tmpfile)
-          puts " => #{target} was updated!"
+          puts "       |+ #{target} was updated!"
           result[:verify_permissions][File.dirname(target)] = verify_permissions(File.dirname(target), dir_perms, options)
           result[:verify_permissions][target] = verify_permissions(target, file_perms, options)
         end
@@ -69,6 +77,7 @@ 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)
@@ -142,11 +151,11 @@ module DanarchyDeploy
 
     def self.diff(target, tmpfile)
       if File.exist?(target) && File.exist?(tmpfile)
-        puts "\n    !! Diff between #{target} <=> #{tmpfile}"
+        puts "\n!! Diff between #{target} <=> #{tmpfile}"
         IO.popen("diff -Naur #{target} #{tmpfile}") do |o|
           puts o.read
         end
-        puts "\n    !! End Diff \n\n"
+        puts "\n!! End Diff \n\n"
       elsif File.exist?(target) && !File.exist?(tmpfile)
         return false
       end
@@ -154,11 +163,42 @@ module DanarchyDeploy
 
     def self.enable_erb(target, tmpfile)
       puts "\n    |+ Moving #{tmpfile} => #{target}"
+      targetdir = File.dirname(target)
+      Dir.exist?(targetdir) || FileUtils.mkdir_p(targetdir, mode: 0755)
       system("mv #{tmpfile} #{target}")
     end
 
     def self.write_tmpfile(source, data)
       File.write(source, data)
     end
+
+    def self.remove_templates(templates, options)
+      templates.delete_if do |template|
+        if template.keys.include?(:remove)
+          if options[:pretend]
+            puts "    - Fake Run - Would have removed: '#{template[:target]}'."
+            false
+          elsif File.exist?(template[:target])
+            puts "    |- Removing: #{template[:target]}"
+            File.delete(template[:target])
+
+            dirname = File.dirname(template[:target])
+            if Dir.exist?(dirname) && Dir.empty?(dirname)
+              puts "    |- Removing empty directory: #{dirname}"
+              Dir.rmdir(dirname)
+              if Dir.exist?(dirname)
+                puts "      ! Failed to remove directory!"
+              else
+                puts "      - Removed directory."
+              end
+            end
+
+            true
+          end
+        end
+      end
+
+      templates
+    end
   end
 end

data/lib/danarchy_deploy/users.rb

@@ -5,8 +5,9 @@ module DanarchyDeploy
       puts "\n" + self.name
       (useradd_result, userdel_result, archives_result) = nil
 
-      deployment[:users].each do |user|
-        puts " > Checking if user '#{user[:username]}' already exists."
+      deployment[:users].each do |username, user|
+        user[:username] = username.to_s
+        puts "\n > Checking if user '#{user[:username]}' already exists."
         usercheck_result = usercheck(user, options)
 
         if usercheck_result[:stdout]
@@ -24,6 +25,7 @@ module DanarchyDeploy
 
           puts "   |+ Adding user: #{user[:username]}"
           useradd_result = useradd(user, options)
+          File.chmod(0750, user[:home]) if Dir.exist?(user[:home])
         end
 
         if !options[:pretend]
@@ -46,10 +48,12 @@ module DanarchyDeploy
           end
         end
 
-        if user[:archives] && !user[:archives].empty?
-          puts " > Deploying archives for #{user[:username]}"
-          DanarchyDeploy::Archiver.new(user[:archives], options)
+        if user[:applications]
+          puts "\n > Checking #{user[:username]}'s applications."
+          user = DanarchyDeploy::Applicator.new(deployment[:os], user, options)
         end
+
+        user.delete(:username)
       end
 
       # [useradd_result, userdel_result]
@@ -60,16 +64,13 @@ module DanarchyDeploy
     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 += "--groups #{user[:groups].join(',')} " if user[:groups]
       useradd_cmd += "--shell /sbin/nologin " if user[:nologin]
       useradd_cmd += "--system " if user[:system]
-      if options[:pretend]
-        puts "\tFake run: #{useradd_cmd}"
-      else
-        DanarchyDeploy::Helpers.run_command(useradd_cmd, options)
-      end
+      DanarchyDeploy::Helpers.run_command(useradd_cmd, options)
     end
 
     def self.userdel(user, options)
@@ -95,11 +96,19 @@ module DanarchyDeploy
     def self.updategroups(user, options)
       groups = user[:groups].join(',')
       groupupdate_cmd = "usermod #{user[:username]} --groups #{groups}"
-      if options[:pretend]
-        puts "\tFake run: #{groupupdate_cmd}"
-      else
-        DanarchyDeploy::Helpers.run_command(groupupdate_cmd, options)
-      end
+      DanarchyDeploy::Helpers.run_command(groupupdate_cmd, options)
+    end
+
+    def self.add_to_group(user, options)
+      groups = user[:groups].join(',')
+      groupadd_cmd = "usermod #{user[:username]} --groups #{groups} --append"
+      DanarchyDeploy::Helpers.run_command(groupadd_cmd, options)
+    end
+
+    def self.remove_from_group(user, group, options)
+      groups = user[:groups].join(',')
+      removegroup_cmd = "gpasswd --remove #{user[:username]} #{group}"
+      DanarchyDeploy::Helpers.run_command(removegroup_cmd, options)
     end
 
     def self.authorized_keys(user)
@@ -109,12 +118,13 @@ module DanarchyDeploy
       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 !f.read.include?(authkey)
+          if contents.include?(authkey)
+            puts "   - Key already in place: #{authkey}"
+          else
             puts "   + Adding authorized_key: #{authkey}"
             f.puts authkey
-          else
-            puts '   - No change needed'
           end
         end
 

data/lib/danarchy_deploy/version.rb

@@ -1,3 +1,3 @@
 module DanarchyDeploy
-  VERSION = "0.1.5"
+  VERSION = "0.2.4"
 end

data/templates/deploy_template.json

@@ -37,8 +37,8 @@
   ],
   "groups": [
     {
-    "groupname": "groupname",
-    "gid": int,
+      "groupname": "groupname",
+      "gid": int
     }
   ],
   "services": {
@@ -48,7 +48,7 @@
           "enable",
           "restart"
         ]
-      }
+      },
       "archives": [
 	{
 	  "target": "/path/to/extract/to/",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.4
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danarchy_couchdb
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '2.13'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.13'
 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:
@@ -90,11 +90,34 @@ files:
 - bin/setup
 - danarchy_deploy.gemspec
 - lib/danarchy_deploy.rb
+- lib/danarchy_deploy/applicator.rb
+- lib/danarchy_deploy/applicator/nginx.rb
+- lib/danarchy_deploy/applicator/phpfpm.rb
+- lib/danarchy_deploy/applicator/redmine.rb
+- lib/danarchy_deploy/applicator/ssl.rb
+- lib/danarchy_deploy/applicator/wordpress.rb
+- lib/danarchy_deploy/applicator/wordpress/wpcli.rb
+- lib/danarchy_deploy/applicator/wordpress/wpcli_install.sh
+- lib/danarchy_deploy/applicator/wordpress/wpconfig.rb
 - lib/danarchy_deploy/archiver.rb
+- lib/danarchy_deploy/archiver/svn.rb
 - lib/danarchy_deploy/groups.rb
+- lib/danarchy_deploy/hash_deep_merge.rb
 - lib/danarchy_deploy/helpers.rb
 - lib/danarchy_deploy/installer.rb
 - lib/danarchy_deploy/services.rb
+- lib/danarchy_deploy/services/init.rb
+- lib/danarchy_deploy/services/init/openrc.rb
+- lib/danarchy_deploy/services/init/systemd.rb
+- lib/danarchy_deploy/services/mongodb.rb
+- lib/danarchy_deploy/services/mysql.rb
+- lib/danarchy_deploy/services/mysql/new_server.rb
+- lib/danarchy_deploy/services/mysql/privileges.rb
+- lib/danarchy_deploy/system.rb
+- lib/danarchy_deploy/system/centos.rb
+- lib/danarchy_deploy/system/debian.rb
+- lib/danarchy_deploy/system/gentoo.rb
+- lib/danarchy_deploy/system/opensuse.rb
 - lib/danarchy_deploy/templater.rb
 - lib/danarchy_deploy/users.rb
 - lib/danarchy_deploy/version.rb
@@ -119,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Pushes deployments locally or remotely based on a JSON/YAML/CouchDB template.