eac_tools 0.31.1 → 0.32.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.45'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +75,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base0
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +85,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,34 +95,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +160,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +175,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -164,6 +185,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
@@ -343,9 +367,12 @@ files:
 - sub/avm-eac_rails_base1/Gemfile
 - sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1.rb
-- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/apache_host.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/apache_host.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/base.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/systemd_unit.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/systemd_unit/service.rb
+- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler_command.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/bundle.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/code_runner.rb
@@ -358,20 +385,20 @@ files:
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner_with/bundle.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner_with/rails_environment.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/sources/base.rb
-- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit.rb
-- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/service.rb
-- sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.rb
 - sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb
 - sub/avm-eac_rails_base1/spec/rubocop_spec.rb
 - sub/avm-eac_rails_base1/spec/spec_helper.rb
-- sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler.service
-- sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.sh
+- sub/avm-eac_rails_base1/template/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler.service
+- sub/avm-eac_rails_base1/template/avm/eac_rails_base1/instances/systemd_unit/tasks_scheduler_command.sh
 - sub/avm-eac_redmine_base0/Gemfile
 - sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/apache_host.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/database.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/gitolite.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/web.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/data_unit.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/deploy.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb
@@ -392,6 +419,8 @@ files:
 - sub/avm-eac_redmine_base0/locale/pt-BR.yml
 - sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/apache_host_spec.rb
 - sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/apache_host_spec_files/apache_host_spec_no_ssl_content.conf
+- sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/base/gitolite_spec.rb
+- sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/base/gitolite_spec_files/config.yml
 - sub/avm-eac_redmine_base0/spec/rubocop_spec.rb
 - sub/avm-eac_redmine_base0/spec/spec_helper.rb
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template
@@ -515,17 +544,17 @@ files:
 - sub/avm-eac_webapp_base0/Gemfile
 - sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/apache_host.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/apache_path.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/appended_directories.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/build.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/file_unit.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/git_info.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/version.rb
-- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/write_on_target.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_host.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/apache_path.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/subcommand_parent.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/build.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/file_unit.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/git_info.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/version.rb
+- sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/apache_host.rb
 - sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/apache_path.rb
@@ -540,8 +569,8 @@ files:
 - sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/sources/base_spec.rb
 - sub/avm-eac_webapp_base0/spec/rubocop_spec.rb
 - sub/avm-eac_webapp_base0/spec/spec_helper.rb
-- sub/avm-eac_webapp_base0/template/avm/eac_webapp_base0/apache_host/no_ssl.conf
-- sub/avm-eac_webapp_base0/template/avm/eac_webapp_base0/apache_path/default.conf
+- sub/avm-eac_webapp_base0/template/avm/eac_webapp_base0/instances/apache_host/no_ssl.conf
+- sub/avm-eac_webapp_base0/template/avm/eac_webapp_base0/instances/apache_path/default.conf
 - sub/avm-eac_wordpress_base0/Gemfile
 - sub/avm-eac_wordpress_base0/avm-eac_wordpress_base0.gemspec
 - sub/avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0.rb
@@ -803,6 +832,11 @@ files:
 - sub/avm/lib/avm/entries/base/uri_components_entries_values/path_component.rb
 - sub/avm/lib/avm/entries/base/uri_components_entries_values/url_component.rb
 - sub/avm/lib/avm/entries/entry.rb
+- sub/avm/lib/avm/entries/jobs.rb
+- sub/avm/lib/avm/entries/jobs/base.rb
+- sub/avm/lib/avm/entries/jobs/variables_source.rb
+- sub/avm/lib/avm/entries/jobs/variables_source/read_entry.rb
+- sub/avm/lib/avm/entries/jobs/with_variables_source.rb
 - sub/avm/lib/avm/entries/keys_constants_set.rb
 - sub/avm/lib/avm/entries/uri_builder.rb
 - sub/avm/lib/avm/executables.rb
@@ -821,9 +855,6 @@ files:
 - sub/avm/lib/avm/instances/docker_image.rb
 - sub/avm/lib/avm/instances/entry_keys.rb
 - sub/avm/lib/avm/instances/runner.rb
-- sub/avm/lib/avm/jobs.rb
-- sub/avm/lib/avm/jobs/base.rb
-- sub/avm/lib/avm/jobs/variables_source.rb
 - sub/avm/lib/avm/launcher/errors/base.rb
 - sub/avm/lib/avm/launcher/errors/non_project.rb
 - sub/avm/lib/avm/launcher/paths/real.rb
@@ -844,6 +875,7 @@ files:
 - sub/avm/lib/avm/result.rb
 - sub/avm/lib/avm/rspec.rb
 - sub/avm/lib/avm/rspec/setup.rb
+- sub/avm/lib/avm/rspec/shared_examples/entries_values.rb
 - sub/avm/lib/avm/rspec/shared_examples/in_avm_registry.rb
 - sub/avm/lib/avm/rspec/shared_examples/not_in_avm_registry.rb
 - sub/avm/lib/avm/runners/base.rb
@@ -885,7 +917,7 @@ files:
 - sub/avm/spec/lib/avm/applications/base_spec.rb
 - sub/avm/spec/lib/avm/applications/base_spec_fixture.yml
 - sub/avm/spec/lib/avm/instances/base_spec.rb
-- sub/avm/spec/lib/avm/instances/base_spec_configs_storage.yml
+- sub/avm/spec/lib/avm/instances/base_spec_files/config.yml
 - sub/avm/spec/lib/avm/scms/base_spec.rb
 - sub/avm/spec/lib/avm/sources/base_spec.rb
 - sub/avm/spec/lib/avm/sources/runner_spec.rb

data/sub/avm/lib/avm/jobs/base.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/jobs/variables_source'
-require 'avm/result'
-require 'eac_cli/core_ext'
-
-module Avm
-  module Jobs
-    module Base
-      common_concern do
-        include ::ActiveSupport::Callbacks
-
-        enable_speaker
-        enable_simple_cache
-        enable_listable
-        common_constructor :instance, :options, default: [{}] do
-          if option_list.present?
-            self.options = option_list.hash_keys_validate!(options.symbolize_keys)
-          end
-        end
-        define_callbacks(*jobs)
-      end
-
-      module ClassMethods
-        def jobs
-          const_get('JOBS').dup
-        end
-      end
-
-      module InstanceMethods
-        def option_list
-          nil
-        end
-
-        def run
-          start_banner if respond_to?(:start_banner)
-          run_jobs
-          ::Avm::Result.success('Done!')
-        rescue ::Avm::Result::Error => e
-          e.to_result
-        end
-
-        def variables_source
-          ::Avm::Jobs::VariablesSource.new(self, instance)
-        end
-
-        protected
-
-        def run_jobs
-          jobs.each do |job|
-            run_callbacks job do
-              send(job)
-            end
-          end
-        end
-
-        def jobs
-          self.class.jobs
-        end
-      end
-    end
-  end
-end

data/sub/avm/lib/avm/jobs/variables_source.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Jobs
-    class VariablesSource
-      common_constructor :job, :instance
-
-      def read_entry(path, options = {})
-        entry_from_job(path) || instance.read_entry(path, options)
-      end
-
-      private
-
-      def entry_from_job(path)
-        method = path.gsub('.', '_').underscore
-        return job.send(method) if job.respond_to?(method, true)
-      end
-    end
-  end
-end

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

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

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

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRailsBase1
-    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

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

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRailsBase1
-    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

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

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/jobs/base'
-require 'avm/eac_ubuntu_base0/apache'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRailsBase1
-    class SystemdUnit
-      JOBS = %w[write_tasks_scheduler_command write_service link_service verify_service
-                reload_systemd enable_service start_service].freeze
-
-      include ::Avm::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

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

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'avm/jobs/base'
-require 'avm/eac_ubuntu_base0/apache'
-require 'eac_templates/core_ext'
-
-module Avm
-  module EacWebappBase0
-    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::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::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

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

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/jobs/base'
-require 'avm/eac_ubuntu_base0/apache'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacWebappBase0
-    class ApachePath
-      JOBS = %w[write_available_conf enable_conf reload_apache].freeze
-      include ::Avm::Jobs::Base
-
-      def content
-        ::Avm::EacWebappBase0::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