avm-eac_webapp_base0 0.18.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c0a15a70bbdad0af58dbf8089f269fbb79449a84453858c67699f9faadbd453
-  data.tar.gz: 2622379fd353257a700fb08868a8eaaf2a2a8a29e85a2f3a667b1eef09fd3e60
+  metadata.gz: f7edaa8cc5ac3631b4fad3e06d2b8bcc2ea7ac68ba3659a6c7a1bea03e605c64
+  data.tar.gz: 6aefbb217c7ed9e2c88e870d2eead47b6364e51d36aff28a7992a2096b89151d
 SHA512:
-  metadata.gz: 1ff7444c0edc597f52df4d7fcf4540e1ca7c7fe9a6b29fa8b96e8bfd1f62a08efbd26f4c17f1fbd72ebc8b4e5d05b7f1df06ec95e256ccef08f9c0b4131bbc08
-  data.tar.gz: 04aaa4f56adf1d09bdc091b6ac3f97a33e92f7801e5251f083e66893422f63ba9440e60ccd6da120ea224061aaa43054c433f1ca61670962146f3a49d1904043
+  metadata.gz: 764a6dded5042e59fd316100bd297bcc728ef9abe3633d7f929a7332c71ef171e80afbbb51519451a58d6785dd625f5296292d43358d10be946f36e7d88bf853
+  data.tar.gz: c5534940248e01a37e818c89f06eaf6bd61a050985fd016b4b9c06ffa061ffdebb41e3a74c727d6112ce53a7b226af955d358678cc5d5e91a43e088efb22dd8d

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

@@ -9,6 +9,11 @@ module Avm
   module EacWebappBase0
     module Instances
       class ApacheBase
+        # @return [String]
+        def document_root
+          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
+        end
+
         protected
 
         def reload_apache

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

@@ -17,10 +17,6 @@ module Avm
                                                       .apply(variables_source)
         end
 
-        def document_root
-          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
-        end
-
         def extra_content
           ''
         end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        module Apache
+          common_concern
+
+          class_methods do
+            # @return [Class]
+            def apache_path_class
+              ancestors.lazy.map { |ancestor| apache_path_class_by_ancestor(ancestor) }
+                       .find(&:present?) || raise("No apache patch class found for \"#{self}\"")
+            end
+
+            private
+
+            # @param ancestor [Module]
+            # @return [Class]
+            def apache_path_class_by_ancestor(ancestor)
+              "#{ancestor.name.deconstantize}::ApachePath".constantize
+            rescue ::NameError
+              nil
+            end
+          end
+
+          # @return [Class]
+          def apache_path_class
+            self.class.apache_path_class
+          end
+
+          # @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
+        end
+      end
+    end
+  end
+end

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

@@ -16,14 +16,6 @@ module Avm
         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,

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

@@ -16,6 +16,10 @@ module Avm
             apache_resource_change(__method__)
           end
 
+          def enabled?
+            instance.apache_resource.enabled?
+          end
+
           def disable
             apache_resource_change(__method__)
           end

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

@@ -12,6 +12,7 @@ module Avm
           end
 
           def run
+            infov 'ApachePath class', stereotype_apache_path_class
             if result.error?
               fatal_error result.to_s
             else
@@ -30,7 +31,7 @@ module Avm
           end
 
           def stereotype_apache_path_class
-            "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
+            runner_context.call(:instance).apache_path_class
           end
         end
       end

data/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.18.0'
+    VERSION = '0.18.2'
   end
 end

data/template/avm/eac_webapp_base0/instances/apache_path/default.conf

@@ -1,9 +1,7 @@
-<IfModule mod_passenger.c>
-    Alias "%%WEB.PATH%%" "%%DOCUMENT_ROOT%%"
-    %%EXTRA_CONTENT%%
-    <Directory "%%DOCUMENT_ROOT%%">
-        Allow from all
-        Options -MultiViews
-        Require all granted
-    </Directory>
-</IfModule>
+Alias "%%WEB.PATH%%" "%%DOCUMENT_ROOT%%"
+%%EXTRA_CONTENT%%
+<Directory "%%DOCUMENT_ROOT%%">
+  Allow from all
+  Options -MultiViews
+  Require all granted
+</Directory>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_webapp_base0
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.2
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-04 00:00:00.000000000 Z
+date: 2023-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.79'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.79'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -98,20 +98,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.117'
+        version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.117.1
+        version: 0.119.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.117'
+        version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.117.1
+        version: 0.119.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ files:
 - 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/apache.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