eac_tools 0.60.1 → 0.60.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caa729c8c9185c74f20a11fa6c623e6269086f4b0b0afec40c60bcbaf638ff44
-  data.tar.gz: ea102dff8ac8f9a6ac3980e83b3167824414eec05e5af59738132b9af1b44f74
+  metadata.gz: cea9f60c673884523dc9facce73368d7f9de5308a57e31da5a50a343a58fbeaa
+  data.tar.gz: 799fbec7b964b8453d66c77c75181d20f24149b38e2dc9bc6a8e007f62b8e474
 SHA512:
-  metadata.gz: 65027ae7f693a5b430cdfc0d1a904636d291f498eb8ecb96a4cc513b7205c4b64c0b8c16201d1045135f812586f7dded38985a62448ebbdabe33b4eb49a065b1
-  data.tar.gz: a75f1adcac0a950ea748418a5f8be220906c1c24f620826b1024e7d8f90bc36732ae0b2e4e8da5bc1c118aa072bdb40e0a2b697e55b506c2c1516ef75f88a97c
+  metadata.gz: 46f50888ff1612d6636f6e68d3132c202b40f01334638ef2ea1aa921425c530ae677f365bedad0b09178094e2033c4844ec8489bc83eeaf92622dc69dbe5533b
+  data.tar.gz: db1a4bc114d5870ed7ad1f3034d79d6c069e8c72b44e6915a71198675cd7ee9435fe3851d294130426b3c4c215854809930f6b288bd8e9ed6b059de23b7e05b5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.60.1)
+    eac_tools (0.60.2)
       avm (~> 0.67)
       avm-eac_asciidoctor_base0 (~> 0.18, >= 0.18.1)
       avm-eac_generic_base0 (~> 0.12)
@@ -11,7 +11,7 @@ PATH
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.10, >= 0.10.1)
       avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
-      avm-eac_redmine_base0 (~> 0.19, >= 0.19.1)
+      avm-eac_redmine_base0 (~> 0.19, >= 0.19.2)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.1)
       avm-eac_webapp_base0 (~> 0.15)
@@ -97,7 +97,7 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.19.1)
+    avm-eac_redmine_base0 (0.19.2)
       avm (~> 0.67)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
@@ -332,7 +332,7 @@ GEM
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
     os (1.1.4)
-    parallel (1.22.1)
+    parallel (1.23.0)
     parseconfig (1.1.2)
     parser (3.2.2.0)
       ast (~> 2.4.1)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.60.1'
+  VERSION = '0.60.2'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -12,6 +12,8 @@ module Avm
       class DockerImage < ::Avm::Instances::DockerImage
         enable_simple_cache
 
+        APACHE_HOST_DOCKERFILE_SUBPATH = 'apache_host_dockerfile'
+        APACHE_PATH_DOCKERFILE_SUBPATH = 'apache_path_dockerfile'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
         REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
@@ -23,9 +25,12 @@ module Avm
         end
 
         def apache_setup
-          return '' if web_path_present?
+          template.child(apache_setup_dockerfile).apply(self)
+        end
 
-          template.child('Dockerfile_apache_setup').apply(self)
+        # @return [String]
+        def apache_setup_dockerfile
+          web_path_present? ? APACHE_PATH_DOCKERFILE_SUBPATH : APACHE_HOST_DOCKERFILE_SUBPATH
         end
 
         def base_image

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.19.1'
+    VERSION = '0.19.2'
   end
 end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_path_dockerfile

@@ -0,0 +1,5 @@
+USER root
+RUN a2ensite 000-default
+RUN a2ensite default-ssl
+RUN a2enmod ssl
+RUN service apache2 restart

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.60.1
+  version: 0.60.2
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -187,7 +187,7 @@ dependencies:
         version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ dependencies:
         version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -671,9 +671,10 @@ files:
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/secrets.yml
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template
-- sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup
+- sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_host_dockerfile
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_http_virtualhost.conf.template
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_https_virtualhost.conf.template
+- sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_path_dockerfile
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/start.sh.template
 - sub/avm-eac_redmine_plugin_base0/Gemfile
 - sub/avm-eac_redmine_plugin_base0/avm-eac_redmine_plugin_base0.gemspec