avm-eac_webapp_base0 0.17.2 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a64a6e37d58ff5b888a189ecb50ddf709475c191cbde98694f48165f888d069
-  data.tar.gz: a49280d8a0ecb8122dfe7a652fc73dc5cde672e8893995e1640699d655f3e341
+  metadata.gz: 601b680bbca5e87118ef02ed575b54c2de088b27550667ccfab81e106006ae44
+  data.tar.gz: 6a7a6069618c7adb10caa554272108bb11501dbe8a680cd2543225a075d07db1
 SHA512:
-  metadata.gz: ef3f787cc889ba004420bbb1e41b54be3b4140181caca3c947c065d9cec1142f75e4ec27453779262fa98b9520f96ed044dd0f21b9a6ad3ab0054901622dfc83
-  data.tar.gz: bd89154642a043de6f8136d65b75150d6123cb74e3c2285f2c999eab035905550ccec8245d2896dd81cfc97795a42731e4d1ca8f3bed40bd0263c2c677ebc97d
+  metadata.gz: 5c9acf7e8303086269f43cb21debe7cf07b2e2124a517851df956f8d508cd0582bcbe8ff9f1d6eed871d564caa60bdf2ed58ba02f08d7abc971fcedfa7f63447
+  data.tar.gz: 15952ef4c0b1b6e93507f1a7698ab5d08470e239bb36b48b85ed3375cdcfb9e0ff4a7a520a26832f7494a8e3ba0407453b9bbd376bdadce8c809f7ed9e278067

data/lib/avm/eac_webapp_base0/instances/apache_base.rb

@@ -0,0 +1,28 @@
+# 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 ApacheBase
+        protected
+
+        def reload_apache
+          infom 'Reloading Apache...'
+          apache.service('reload')
+        end
+
+        private
+
+        # @return [Avm::EacUbuntuBase0::Apache]
+        def apache_uncached
+          instance.platform_instance.apache
+        end
+      end
+    end
+  end
+end

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

@@ -3,12 +3,13 @@
 require 'eac_ruby_utils/core_ext'
 require 'avm/entries/jobs/base'
 require 'avm/eac_ubuntu_base0/apache'
+require 'avm/eac_webapp_base0/instances/apache_base'
 require 'eac_templates/core_ext'
 
 module Avm
   module EacWebappBase0
     module Instances
-      class ApacheHost
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheBase
         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
@@ -31,10 +32,6 @@ module Avm
 
         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
@@ -51,11 +48,6 @@ module Avm
           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

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

@@ -2,12 +2,13 @@
 
 require 'avm/entries/jobs/base'
 require 'avm/eac_ubuntu_base0/apache'
+require 'avm/eac_webapp_base0/instances/apache_base'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacWebappBase0
     module Instances
-      class ApachePath
+      class ApachePath < ::Avm::EacWebappBase0::Instances::ApacheBase
         JOBS = %w[write_available_conf enable_conf reload_apache].freeze
         include ::Avm::Entries::Jobs::Base
 
@@ -26,20 +27,11 @@ module Avm
 
         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

data/lib/avm/eac_webapp_base0/instances/base/install.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        module Install
+          common_concern do
+            uri_components_entries_values 'install', %w[apache_resource_name]
+          end
+
+          def install_apache_resource_name_default_value
+            id
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ require 'avm/instances/base'
 require 'avm/eac_postgresql_base0/instance_with'
 require 'avm/instances/data/files_unit'
 require 'avm/instances/data/package'
+require 'avm/eac_webapp_base0/instances/processes/web_server'
 require 'avm/eac_webapp_base0/instances/runners'
 require 'avm/eac_ubuntu_base0/instances/base'
 
@@ -11,10 +12,18 @@ module Avm
   module EacWebappBase0
     module Instances
       class Base < ::Avm::Instances::Base
-        require_sub __FILE__
+        require_sub __FILE__, include_modules: true
         include ::Avm::EacPostgresqlBase0::InstanceWith
         enable_simple_cache
 
+        # @return [Avm::EacUbuntuBase0::Apache::Resource, nil]
+        def apache_resource
+          %i[conf site]
+            .lazy
+            .map { |type| platform_instance.apache.send(type, install_apache_resource_name) }
+            .find(&:available?)
+        end
+
         def run_subcommand(subcommand_class, argv)
           subcommand_class.create(
             argv: argv,
@@ -26,6 +35,11 @@ module Avm
           pg_data_unit
         end
 
+        # @return [Array<Avm::Instances::Process>]
+        def processes
+          super + [::Avm::EacWebappBase0::Instances::Processes::WebServer.new(self)]
+        end
+
         private
 
         # @return [Avm::EacUbuntuBase0::Instances::Base]

data/lib/avm/eac_webapp_base0/instances/processes/web_server.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/instances/process'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Processes
+        class WebServer < ::Avm::Instances::Process
+          def available?
+            instance.apache_resource.present?
+          end
+
+          def enable
+            apache_resource_change(__method__)
+          end
+
+          def enabled?
+            instance.apache_resource.enabled?
+          end
+
+          def disable
+            apache_resource_change(__method__)
+          end
+
+          private
+
+          def apache_resource_change(action)
+            instance.apache_resource.send(action)
+            instance.platform_instance.apache.service(:reload)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/instances/processes.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Processes
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.17.2'
+    VERSION = '0.18.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_webapp_base0
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.73'
+        version: '0.78'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.73'
+        version: '0.78'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +99,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.117'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.117.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,6 +109,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.117'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.117.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -142,9 +142,11 @@ files:
 - lib/avm/eac_webapp_base0/file_formats/json.rb
 - lib/avm/eac_webapp_base0/file_formats/provider.rb
 - lib/avm/eac_webapp_base0/file_formats/xml.rb
+- lib/avm/eac_webapp_base0/instances/apache_base.rb
 - lib/avm/eac_webapp_base0/instances/apache_host.rb
 - lib/avm/eac_webapp_base0/instances/apache_path.rb
 - lib/avm/eac_webapp_base0/instances/base.rb
+- lib/avm/eac_webapp_base0/instances/base/install.rb
 - lib/avm/eac_webapp_base0/instances/deploy.rb
 - lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
 - lib/avm/eac_webapp_base0/instances/deploy/build.rb
@@ -152,6 +154,8 @@ files:
 - lib/avm/eac_webapp_base0/instances/deploy/setup_files_unit.rb
 - lib/avm/eac_webapp_base0/instances/deploy/version.rb
 - lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb
+- lib/avm/eac_webapp_base0/instances/processes.rb
+- lib/avm/eac_webapp_base0/instances/processes/web_server.rb
 - lib/avm/eac_webapp_base0/instances/runners.rb
 - lib/avm/eac_webapp_base0/instances/runners/apache_host.rb
 - lib/avm/eac_webapp_base0/instances/runners/apache_path.rb