avm-eac_webapp_base0 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef908a36e6548511db94039c83e10cdc43a98a47bcde978b9a1d0a884c6202d3
-  data.tar.gz: d4eafd0f5270d85c49ec87e78f43ca6f81a5fa66464db449629eb0fd40b4ac10
+  metadata.gz: c54900f40cbb246d07176ed3e482e002249df9a1f4253107d51c148bc8043c4e
+  data.tar.gz: 35faefcc23749106207ec0e41a7cc032beea459f81bc152ea441481bb35762bc
 SHA512:
-  metadata.gz: d0afe6e4dd2bc5582225a9ad332c89ff3b33ab12b40726c97597b81a2ea55640ec236c654e81d58972de1a28b84a73dd91f35c12d48e28756757eaf1616b6dbd
-  data.tar.gz: d0c7a37bb94ec9c11320ce783f47b95df52d1ecf48c0f74197479945dfd790a078393f4b8592ccfa2ccaf8fd221244cfb7a05fd109e683617e772ebf9a38de0e
+  metadata.gz: b2a120a192f25621e2111037d53683635cee565f5fd9f4805d7b4ea1056d6e884421b82d6842df05b8644f76302b5a34598cd5647220e5e24e0c6f7329f2ea47
+  data.tar.gz: 53add19e7a64aca1b4c244d9b6e4a1bc2b36918ae9364dfcd116b7aa914bc6fe173d1ccb304701cd212e767511bc4abc9dda4679b4074f105a66420e9f63b749

data/lib/avm/eac_webapp_base0/apache_host.rb

@@ -8,10 +8,15 @@ 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')
@@ -61,7 +66,7 @@ module Avm
         instance.host_env.command(
           'sudo', 'certbot', '--apache', '--domain', instance.read_entry('web.hostname'),
           '--redirect', '--non-interactive', '--agree-tos',
-          '--email', instance.read_entry('admin.email')
+          '--email', instance.install_email
         ).system!
       end
 

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class ApacheHost
+          runner_with :help do
+            desc 'Configure Apache virtual host for instance.'
+            bool_opt '-c', '--certbot', 'Install certbot.'
+          end
+
+          def run
+            result = stereotype_apache_host_class.new(runner_context.call(:instance),
+                                                      stereotype_apache_host_options).run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          def stereotype_apache_host_class
+            "#{runner_context.call(:instance).class.name.deconstantize}::ApacheHost".constantize
+          end
+
+          def stereotype_apache_host_options
+            { certbot: parsed.certbot? }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class ApachePath
+          runner_with :help do
+            desc 'Configure Apache path configuration for instance.'
+          end
+
+          def run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          private
+
+          def apache_path_uncached
+            stereotype_apache_path_class.new(runner_context.call(:instance))
+          end
+
+          def result_uncached
+            apache_path.run
+          end
+
+          def stereotype_apache_path_class
+            "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/instances/runner'
+require 'avm/path_string'
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class Deploy
+          runner_with :help do
+            desc 'Deploy for instance.'
+            arg_opt '-r', '--reference', 'Git reference to deploy.'
+            arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
+            bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
+          end
+
+          def deploy_class
+            runner_context.call(:stereotype_module).const_get('Instances').const_get('Deploy')
+          rescue ::NameError
+            runner_context.call(:stereotype_module).const_get('Deploy')
+          end
+
+          def run
+            result = deploy_class.new(runner_context.call(:instance), deploy_options).run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          def deploy_options
+            { reference: parsed.reference,
+              appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
+              no_request_test: parsed.no_request_test? }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.6.1'
+    VERSION = '0.8.0'
   end
 end

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

@@ -7,5 +7,5 @@
     Allow from all
     Options -MultiViews
     Require all granted
-  </Directory>
+%%DIRECTORY_EXTRA_CONFIG%%  </Directory>
 </VirtualHost>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_webapp_base0
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: '0.42'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: '0.42'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.103'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.103'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -119,13 +113,13 @@ files:
 - lib/avm/eac_webapp_base0/instances/base.rb
 - lib/avm/eac_webapp_base0/instances/base/subcommand_parent.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
 - lib/avm/eac_webapp_base0/instances/runners/data.rb
 - lib/avm/eac_webapp_base0/instances/runners/data/dump.rb
 - lib/avm/eac_webapp_base0/instances/runners/data/load.rb
+- lib/avm/eac_webapp_base0/instances/runners/deploy.rb
 - lib/avm/eac_webapp_base0/runner.rb
-- lib/avm/eac_webapp_base0/runner/apache_host.rb
-- lib/avm/eac_webapp_base0/runner/apache_path.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

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

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/runner'
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    class Runner < ::Avm::Instances::Runner
-      class ApacheHost
-        runner_with :help do
-          desc 'Configure Apache virtual host for instance.'
-          bool_opt '-c', '--certbot', 'Install certbot.'
-        end
-
-        def run
-          result = stereotype_apache_host_class.new(runner_context.call(:instance),
-                                                    stereotype_apache_host_options).run
-          if result.error?
-            fatal_error result.to_s
-          else
-            infov 'Result', result.label
-          end
-        end
-
-        def stereotype_apache_host_class
-          "#{runner_context.call(:instance).class.name.deconstantize}::ApacheHost".constantize
-        end
-
-        def stereotype_apache_host_options
-          { certbot: parsed.certbot? }
-        end
-      end
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-require 'avm/instances/runner'
-require 'avm/eac_webapp_base0/runner/apache_host'
-require 'avm/eac_rails_base0/apache_path'
-
-module Avm
-  module EacWebappBase0
-    class Runner < ::Avm::Instances::Runner
-      class ApachePath
-        runner_with :help do
-          desc 'Configure Apache path configuration for instance.'
-        end
-
-        def run
-          if result.error?
-            fatal_error result.to_s
-          else
-            infov 'Result', result.label
-          end
-        end
-
-        private
-
-        def apache_path_uncached
-          stereotype_apache_path_class.new(runner_context.call(:instance))
-        end
-
-        def result_uncached
-          apache_path.run
-        end
-
-        def stereotype_apache_path_class
-          "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_webapp_base0/runner/deploy.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/runner'
-require 'avm/path_string'
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    class Runner < ::Avm::Instances::Runner
-      class Deploy
-        runner_with :help do
-          desc 'Deploy for instance.'
-          arg_opt '-r', '--reference', 'Git reference to deploy.'
-          arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
-          bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
-        end
-
-        def deploy_class
-          runner_context.call(:stereotype_module).const_get('Instances').const_get('Deploy')
-        rescue ::NameError
-          runner_context.call(:stereotype_module).const_get('Deploy')
-        end
-
-        def run
-          result = deploy_class.new(runner_context.call(:instance), deploy_options).run
-          if result.error?
-            fatal_error result.to_s
-          else
-            infov 'Result', result.label
-          end
-        end
-
-        def deploy_options
-          { reference: parsed.reference,
-            appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
-            no_request_test: parsed.no_request_test? }
-        end
-      end
-    end
-  end
-end