avm-eac_webapp_base0 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6207f24ec7b812f56eb7bb43c09b6a846dec725abb96176f2824a8d63fa9eddf
-  data.tar.gz: e246cbd54afffb163cc7950ce8daf58f13bf663d134cb4967d8ae11fd679e42b
+  metadata.gz: 4503e67063e157b013c446020e021b8978ac61f8e795e2f710a61405b8891ec4
+  data.tar.gz: 77b30734d318f75fdad17c2f00289682811d093f3f2a91d99c6b75df2e1d26dd
 SHA512:
-  metadata.gz: 45825f6b6f5759f16f9e23599beea5f522f5ab108978baef44448e35da4e16a54796251434a93a70d244d7fad732a33a3bc9044cd0567a5a3d281b3a306cd292
-  data.tar.gz: b97d174100887848c1486220c938b5e160b91914ecd8b312a3e513ec09a1177d55bbd42542016e244f60aaf3116dd19f64b0c0d169732fbe19335c354955f727
+  metadata.gz: 9ee140cb7ee147c8e4b1fbbd7e66a9c4fc98783ff9774f8f4adeaaf304cf84319b3da05d0c658dc8cefbe11bfcd4d04cc8b7188605b652819402b9a70ddd3440
+  data.tar.gz: d1a2d0400102d4be54379f421696a4694e6220d9a5dc5e22804d6b276d5e3bea4679317fac9fb68aabd8b4acf56c5b0ccd751bdcfb03f32107d8b9a0ae0db5d7

data/lib/avm/eac_webapp_base0/apache_host.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/apps/jobs/base'
-require 'avm/patches/object/template'
+require 'avm/jobs/base'
 require 'avm/eac_ubuntu_base0/apache'
-require 'avm/patches/object/template'
+require 'eac_templates/core_ext'
 
 module Avm
   module EacWebappBase0
     class ApacheHost
       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::Apps::Jobs::Base
+      include ::Avm::Jobs::Base
 
       def no_ssl_site_content
         ::Avm::EacWebappBase0::ApacheHost

data/lib/avm/eac_webapp_base0/apache_path.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/jobs/base'
+require 'avm/jobs/base'
 require 'avm/eac_ubuntu_base0/apache'
 require 'eac_ruby_utils/core_ext'
 
@@ -8,7 +8,7 @@ module Avm
   module EacWebappBase0
     class ApachePath
       JOBS = %w[write_available_conf enable_conf reload_apache].freeze
-      include ::Avm::Apps::Jobs::Base
+      include ::Avm::Jobs::Base
 
       def content
         ::Avm::EacWebappBase0::ApachePath.template.child('default.conf').apply(variables_source)

data/lib/avm/eac_webapp_base0/deploy.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'active_support/callbacks'
-require 'avm/apps/jobs/base'
+require 'avm/jobs/base'
 require 'avm/git'
-require 'avm/patches/object/template'
 require 'eac_ruby_utils/core_ext'
+require 'eac_templates/core_ext'
 require 'avm/launcher/git/base'
 require 'net/http'
 
@@ -19,7 +19,7 @@ module Avm
       JOBS = (%w[create_build_dir build_content append_instance_content write_on_target
                  setup_files_units assert_instance_branch] + [REQUEST_TEST_JOB]).freeze
 
-      include ::Avm::Apps::Jobs::Base
+      include ::Avm::Jobs::Base
 
       lists.add_symbol :option, :appended_directories, :no_request_test, :reference
 

data/lib/avm/eac_webapp_base0/instance.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
 require 'avm/instances/base'
-require 'avm/postgresql/instance_with'
+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_ubuntu_base0/instances/base'
 
 module Avm
   module EacWebappBase0
     class Instance < ::Avm::Instances::Base
       require_sub __FILE__
-      include ::Avm::Postgresql::InstanceWith
+      include ::Avm::EacPostgresqlBase0::InstanceWith
+      enable_simple_cache
 
       FILES_UNITS = [].freeze
 
@@ -45,6 +47,11 @@ module Avm
 
       private
 
+      # @return [Avm::EacUbuntuBase0::Instances::Base]
+      def platform_instance_uncached
+        ::Avm::EacUbuntuBase0::Instances::Base.by_id(id)
+      end
+
       def files_units
         self.class.const_get('FILES_UNITS').transform_values do |fs_path_subpath|
           ::Avm::Data::Instance::FilesUnit.new(self, fs_path_subpath)

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+
+module Avm
+  module EacWebappBase0
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        def valid?
+          false
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/sources.rb

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

data/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.1.1'
+    VERSION = '0.3.0'
   end
 end

data/template/avm/eac_webapp_base0/apache_host/no_ssl.conf

@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+  ServerName "%%WEB.HOSTNAME%%"
+  DocumentRoot "%%DOCUMENT_ROOT%%"
+  %%EXTRA_CONTENT%%
+
+  <Directory "%%DOCUMENT_ROOT%%">
+    Allow from all
+    Options -MultiViews
+    Require all granted
+  </Directory>
+</VirtualHost>

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_webapp_base0
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-02 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -24,6 +24,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: avm-eac_generic_base0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: avm-eac_postgresql_base0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: avm-eac_ubuntu_base0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +119,11 @@ files:
 - lib/avm/eac_webapp_base0/runner/data/dump.rb
 - lib/avm/eac_webapp_base0/runner/data/load.rb
 - lib/avm/eac_webapp_base0/runner/deploy.rb
+- lib/avm/eac_webapp_base0/sources.rb
+- lib/avm/eac_webapp_base0/sources/base.rb
 - lib/avm/eac_webapp_base0/version.rb
+- template/avm/eac_webapp_base0/apache_host/no_ssl.conf
+- template/avm/eac_webapp_base0/apache_path/default.conf
 homepage: 
 licenses: []
 metadata: {}