eac_tools 0.31.0 → 0.32.0

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

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

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_templates/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class ApacheHost
+        APACHE_DIRECTORY_EXTRA_CONFIG_KEY = 'install.apache_directory_extra_config'
+        JOBS = %w[write_available_no_ssl_site enable_no_ssl_site remove_ssl_site reload_apache
+                  run_certbot enable_ssl_site reload_apache].freeze
+        include ::Avm::Entries::Jobs::Base
+
+        def directory_extra_config
+          instance.entry(APACHE_DIRECTORY_EXTRA_CONFIG_KEY).value.if_present { |v| "  #{v}\n" }
+        end
+
+        def no_ssl_site_content
+          ::Avm::EacWebappBase0::Instances::ApacheHost
+            .template.child('no_ssl.conf')
+            .apply(variables_source)
+        end
+
+        def ssl?
+          options[:certbot]
+        end
+
+        private
+
+        def apache_uncached
+          ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
+        end
+
+        def enable_no_ssl_site
+          infom 'Enabling no SSL site...'
+          no_ssl_site.enable
+        end
+
+        def enable_ssl_site
+          return unless ssl?
+
+          infom 'Enabling SSL site...'
+          ssl_site.enable
+        end
+
+        def no_ssl_site_uncached
+          apache.site(instance.id)
+        end
+
+        def reload_apache
+          infom 'Reloading Apache...'
+          apache.service('reload')
+        end
+
+        def remove_ssl_site
+          infom 'Removing SSL site...'
+          ssl_site.remove
+        end
+
+        def run_certbot
+          return unless ssl?
+
+          infom 'Running Certbot...'
+          instance.host_env.command(
+            'sudo', 'certbot', '--apache', '--domain', instance.read_entry('web.hostname'),
+            '--redirect', '--non-interactive', '--agree-tos',
+            '--email', instance.install_email
+          ).system!
+        end
+
+        def ssl_site_uncached
+          apache.site(no_ssl_site.name + '-le-ssl')
+        end
+
+        def write_available_no_ssl_site
+          infom 'Writing no SSL site conf...'
+          no_ssl_site.write(no_ssl_site_content)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_path.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class ApachePath
+        JOBS = %w[write_available_conf enable_conf reload_apache].freeze
+        include ::Avm::Entries::Jobs::Base
+
+        def content
+          ::Avm::EacWebappBase0::Instances::ApachePath.template.child('default.conf')
+                                                      .apply(variables_source)
+        end
+
+        def document_root
+          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
+        end
+
+        def extra_content
+          ''
+        end
+
+        private
+
+        def apache_uncached
+          ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
+        end
+
+        def enable_conf
+          infom 'Enabling configuration...'
+          conf.enable
+        end
+
+        def reload_apache
+          infom 'Reloading Apache...'
+          apache.service('reload')
+        end
+
+        def conf_uncached
+          apache.conf(instance.id)
+        end
+
+        def write_available_conf
+          infom 'Writing available configuration...'
+          conf.write(content)
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ require 'avm/instances/base'
 require 'avm/eac_postgresql_base0/instance_with'
 require 'avm/data/instance/files_unit'
 require 'avm/data/instance/package'
-require 'avm/eac_webapp_base0/deploy/file_unit'
+require 'avm/eac_webapp_base0/instances/deploy/file_unit'
 require 'avm/eac_webapp_base0/instances/runners'
 require 'avm/eac_ubuntu_base0/instances/base'
 

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/path_string'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        module AppendedDirectories
+          APPENDED_DIRECTORIES_ENTRY_KEY = 'deploy.appended_directories'
+
+          def appended_directories
+            appended_directories_from_instance_entry + appended_directories_from_options
+          end
+
+          def appended_directories_from_instance_entry
+            ::Avm::PathString.paths(instance.read_entry_optional(APPENDED_DIRECTORIES_ENTRY_KEY))
+          end
+
+          def appended_directories_from_options
+            options[OPTION_APPENDED_DIRECTORIES] || []
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/build.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'avm/files/appender'
+require 'avm/files/deploy'
+require 'eac_ruby_utils/envs'
+require 'eac_ruby_utils/fs/temp'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        module Build
+          private
+
+          attr_accessor :build_dir
+
+          def append_instance_content
+            ::Avm::Files::Appender
+              .new
+              .variables_source_set(variables_source)
+              .append_templatized_directory(template.path)
+              .append_templatized_directories(appended_directories)
+              .append_file_content(version_target_path, version)
+              .write_appended_on(build_dir)
+          end
+
+          def build_dir_env
+            ::EacRubyUtils::Envs.local
+          end
+
+          def create_build_dir
+            self.build_dir = ::EacRubyUtils::Fs::Temp.directory
+          end
+
+          def remove_build_dir
+            build_dir&.remove
+          end
+
+          def build_content
+            infom 'Writing Git source code...'
+            ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
+              build_dir_env,
+              build_dir
+            ).variables_source_set(variables_source).run
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/file_unit.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        class FileUnit < ::SimpleDelegator
+          attr_reader :data_key, :fs_path_subpath
+
+          def initialize(deploy, data_key, fs_path_subpath)
+            super(deploy)
+            @data_key = data_key
+            @fs_path_subpath = fs_path_subpath
+          end
+
+          def run
+            assert_source_directory
+            link_source_target
+          end
+
+          def assert_source_directory
+            infom "Asserting \"#{data_key}\" source directory..."
+            instance.host_env.command('mkdir', '-p', source_path).execute!
+          end
+
+          def source_path
+            ::File.join(instance.install_data_path, data_key.to_s)
+          end
+
+          def target_path
+            ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
+                        fs_path_subpath.to_s)
+          end
+
+          def link_source_target
+            infom "Linking \"#{data_key}\" directory..."
+            instance.host_env.command('rm', '-rf', target_path).execute!
+            instance.host_env.command('ln', '-s', source_path, target_path).execute!
+          end
+        end
+      end
+    end
+  end
+end