eac_tools 0.31.1 → 0.32.0

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/deploy.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/instances/deploy'
 require 'avm/eac_asciidoctor_base0/sources/base'
 require 'avm/eac_asciidoctor_base0/sources/build'
 
 module Avm
   module EacAsciidoctorBase0
     module Instances
-      class Deploy < ::Avm::EacWebappBase0::Deploy
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
         def build_content
           ::Avm::EacAsciidoctorBase0::Sources::Build.new(
             project,

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   end
 end

data/sub/avm-eac_latex_base0/avm-eac_latex_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.41'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.5', '>= 0.5.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'avm', '~> 0.45'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/instances/apache_host.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/apache_host'
+require 'avm/eac_webapp_base0/instances/apache_host'
 
 module Avm
   module EacLatexBase0
     module Instances
-      class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
         def document_root
           instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         end

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/instances/deploy.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/instances/deploy'
 require 'avm/eac_latex_base0/sources/base'
 require 'avm/eac_latex_base0/sources/build'
 
 module Avm
   module EacLatexBase0
     module Instances
-      class Deploy < ::Avm::EacWebappBase0::Deploy
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
         def build_content
           ::Avm::EacLatexBase0::Sources::Build.new(project, output_file:
               build_dir.join(pdf_path))

data/sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacLatexBase0
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.7'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_host.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base1/apache_host'
+require 'avm/eac_rails_base1/instances/apache_host'
 
 module Avm
   module EacRailsBase0
-    class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
+    class ApacheHost < ::Avm::EacRailsBase1::Instances::ApacheHost
     end
   end
 end

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_path.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'eac_templates/core_ext'
-require 'avm/eac_webapp_base0/apache_path'
+require 'avm/eac_webapp_base0/instances/apache_path'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacRailsBase0
-    class ApachePath < ::Avm::EacWebappBase0::ApachePath
+    class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
       def document_root
         ::File.join(super, 'public')
       end

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/deploy.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'eac_templates/core_ext'
-require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/instances/deploy'
 require 'avm/instances/entry_keys'
 
 module Avm
   module EacRailsBase0
-    class Deploy < ::Avm::EacWebappBase0::Deploy
+    class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
       set_callback :assert_instance_branch, :after do
         bundle_install
         assert_database

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'
   end
 end

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.41'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.20'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'avm', '~> 0.45'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.21'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_host.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/apache_host'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
+        def document_root
+          "#{instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)}/public"
+        end
+
+        def extra_content
+          'PassengerEnabled On'
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/systemd_unit/service.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class SystemdUnit
+        module Service
+          def service_content
+            template.child('tasks_scheduler.service').apply(variables_source)
+          end
+
+          def service_exec_lines
+            service_exec_operations
+              .map { |k, v| "#{k}=#{tasks_scheduler_command_path} #{v}" }
+              .join("\n")
+          end
+
+          def service_path
+            ::Pathname.new('/etc/systemd/system').join(unit_name)
+          end
+
+          def service_link_path
+            ::Pathname.new('/etc/systemd/system/multi-user.target.wants').join(unit_name)
+          end
+
+          def verify_service
+            sudo_system!('systemd-analyze', 'verify', service_path)
+          end
+
+          private
+
+          def enable_service
+            systemctl('enable', unit_name)
+          end
+
+          def link_service
+            sudo_execute!('rm', '-f', service_link_path)
+            sudo_execute!('ln', '-s', service_path, service_link_path)
+          end
+
+          def reload_systemd
+            systemctl('daemon-reload')
+          end
+
+          # @return [Hash<String, String>]
+          def service_exec_operations
+            if exec_run?
+              { 'ExecStart' => 'run' }
+            else
+              { 'ExecStart' => 'start', 'ExecStop' => 'stop' }
+            end
+          end
+
+          def start_service
+            systemctl('start', unit_name)
+          end
+
+          def systemctl(*args)
+            sudo_system!('systemctl', *args)
+          end
+
+          def write_service
+            infom 'Writing service\'s unit file...'
+            platform_instance.file_sudo_write(service_path, service_content)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler_command.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class SystemdUnit
+        module TasksSchedulerCommand
+          def tasks_scheduler_command_content
+            template.child('tasks_scheduler_command.sh').apply(variables_source)
+          end
+
+          def tasks_scheduler_command_path
+            "/opt/aux/#{instance.id}/tasks_scheduler.sh"
+          end
+
+          private
+
+          def write_tasks_scheduler_command
+            infom 'Writing tasks scheduler\'s command...'
+            sudo_execute!('mkdir', '-p', ::File.dirname(tasks_scheduler_command_path))
+            platform_instance.file_sudo_write(tasks_scheduler_command_path,
+                                              tasks_scheduler_command_content)
+            sudo_execute!('chmod', '+x', tasks_scheduler_command_path)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/systemd_unit.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    module Instances
+      class SystemdUnit
+        JOBS = %w[write_tasks_scheduler_command write_service link_service verify_service
+                  reload_systemd enable_service start_service].freeze
+
+        include ::Avm::Entries::Jobs::Base
+        require_sub __FILE__, include_modules: true
+        delegate :platform_instance, to: :instance
+
+        enable_listable
+        lists.add_symbol :option, :exec_run, :restart
+
+        def description
+          "#{instance.id} Tasks Scheduler"
+        end
+
+        def exec_run?
+          options[OPTION_EXEC_RUN]
+        end
+
+        def option_list
+          self.class.lists.option
+        end
+
+        def restart
+          options[OPTION_RESTART]
+        end
+
+        def unit_name
+          "#{instance.id}_tasks_scheduler.service"
+        end
+
+        def user
+          instance.install_username
+        end
+
+        private
+
+        def sudo_execute!(*args)
+          platform_instance.host_env.command(['sudo'] + args).execute!
+        end
+
+        def sudo_system!(*args)
+          command_args = ['sudo'] + args
+          infom "Running \"#{::Shellwords.join(command_args)}\"..."
+          platform_instance.host_env.command(command_args).system!
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/tasks_scheduler/systemd_unit.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base1/systemd_unit'
+require 'avm/eac_rails_base1/instances/systemd_unit'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -31,9 +31,9 @@ module Avm
           private
 
           def systemd_unit_uncached
-            ::Avm::EacRailsBase1::SystemdUnit.new(runner_context.call(:instance),
-                                                  restart: parsed.restart,
-                                                  exec_run: parsed.exec_run?)
+            ::Avm::EacRailsBase1::Instances::SystemdUnit.new(runner_context.call(:instance),
+                                                             restart: parsed.restart,
+                                                             exec_run: parsed.exec_run?)
           end
 
           def result_uncached

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.43'
+  s.add_dependency 'avm', '~> 0.44'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.103'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/apache_host.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base1/apache_host'
+require 'avm/eac_rails_base1/instances/apache_host'
 
 module Avm
   module EacRedmineBase0
     module Instances
-      class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
+      class ApacheHost < ::Avm::EacRailsBase1::Instances::ApacheHost
       end
     end
   end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/database.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        module Database
+          DATABASE_INTERNAL_HOSTNAME = 'localhost'
+          DEFAULT_POSTGRESQL_VERSION = '12'
+
+          common_concern do
+            uri_components_entries_values 'postgresql', %w[version]
+          end
+
+          def database_internal
+            entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value ==
+              DATABASE_INTERNAL_HOSTNAME
+          end
+
+          def postgresql_version_default_value
+            DEFAULT_POSTGRESQL_VERSION
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/gitolite.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        module Gitolite
+          GITOLITE_ENTRY_KEYS_PREFIX = 'gitolite'
+          DEFAULT_HOSTNAME = 'localhost'
+          DEFAULT_PATH_PARENT = '/var/lib'
+          DEFAULT_SCHEME = 'file'
+          DEFAULT_USERNAME = 'git'
+
+          common_concern do
+            uri_components_entries_values GITOLITE_ENTRY_KEYS_PREFIX
+          end
+
+          def gitolite_hostname_default_value
+            DEFAULT_HOSTNAME
+          end
+
+          def gitolite_path_default_value
+            read_entry_optional([GITOLITE_ENTRY_KEYS_PREFIX, 'username']).if_present do |v|
+              ::File.join(DEFAULT_PATH_PARENT, v)
+            end
+          end
+
+          def gitolite_scheme_default_value
+            DEFAULT_SCHEME
+          end
+
+          def gitolite_username_default_value
+            DEFAULT_USERNAME
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/web.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        module Web
+          def web_authority
+            web_hostname.if_present do |h|
+              h.to_s + web_port_optional.if_present('') { |p| ":#{p}" }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb

@@ -11,6 +11,7 @@ module Avm
   module EacRedmineBase0
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
+        require_sub __FILE__, include_modules: true
         enable_simple_cache
 
         FILES_UNITS = { files: 'files' }.freeze

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/deploy.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/instances/deploy'
 require 'eac_ruby_utils/ruby'
 
 module Avm
   module EacRedmineBase0
     module Instances
-      class Deploy < ::Avm::EacWebappBase0::Deploy
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
         set_callback :assert_instance_branch, :after, :run_installer
 
         def run_installer

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -14,9 +14,10 @@ module Avm
         BASE_IMAGE = 'ubuntu:20.04'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
-        DATABASE_INTERNAL_HOSTNAME = 'localhost'
         REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
 
+        delegate :database_internal, to: :instance
+
         def avm_fs_cache_object_id
           instance.id
         end
@@ -31,11 +32,6 @@ module Avm
           eac_ubuntu_base0_instance.docker_image.provide.id
         end
 
-        def database_internal
-          instance.entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value ==
-            DATABASE_INTERNAL_HOSTNAME
-        end
-
         def installer_target_task
           if web_path_present?
             INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.15.0'
+    VERSION = '0.16.0'
   end
 end

data/sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/base/gitolite_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/instances/base'
+
+RSpec.describe ::Avm::EacRedmineBase0::Instances::Base do
+  include_examples 'entries_values', __FILE__, {
+    'app_0' => {
+      'gitolite.username' => 'git',
+      'gitolite.path' => '/var/lib/git',
+      'gitolite.scheme' => 'file',
+      'gitolite.hostname' => 'localhost'
+    },
+    'app_1' => {
+      'gitolite.username' => 'git1',
+      'gitolite.path' => '/var/lib/git1',
+      'gitolite.scheme' => 'file',
+      'gitolite.hostname' => 'localhost'
+    },
+    'app_2' => {
+      'gitolite.username' => 'git2',
+      'gitolite.path' => '/home/git2',
+      'gitolite.scheme' => 'file',
+      'gitolite.hostname' => 'localhost'
+    }
+  }
+end

data/sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/base/gitolite_spec_files/config.yml

@@ -0,0 +1,10 @@
+---
+app_0: {}
+app_1:
+  gitolite:
+    username: git1
+    id: app_0
+app_2:
+  gitolite:
+    username: git2
+    path: /home/git2

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template

@@ -1,10 +1,17 @@
+# Ruby
+export rvm_ruby='ruby-%%RUBY.VERSION%%'
+
+# Database
+export postgresql_internal='%%DATABASE_INTERNAL%%'
+export postgresql_host='%%DATABASE.HOSTNAME%%'
+export postgresql_port='%%DATABASE.PORT%%'
 export postgresql_database='%%DATABASE.NAME%%'
-export postgresql_database_test='%%DATABASE.NAME%%_test'
 export postgresql_user='%%DATABASE.USERNAME%%'
 export postgresql_password='%%DATABASE.PASSWORD%%'
 export postgresql_version='%%POSTGRESQL.VERSION%%'
-export rvm_ruby='ruby-%%RUBY.VERSION%%'
-export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
+export postgresql_extra_settings='%%DATABASE.EXTRA%%'
+
+# Web
 if [ '%%WEB.SCHEME%%' == 'https' ]; then
   export address_https='true'
 else
@@ -17,6 +24,7 @@ export address_path='%%WEB.PATH%%'
 export git_repositories_hierarchical_organisation=false
 export gitolite_user='%%GIT.USERNAME%%'
 export gitolite_user_home="/var/lib/${gitolite_user}"
+export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
 
 # Mail settings
 export smtp_server='%%MAILER.SMTP.ADDRESS%%'

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.42'
+  s.add_dependency 'avm', '~> 0.45'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.103'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end