avm-eac_redmine_base0 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b27527dc74e72e965df3c22833d830e38db777b978c51029724bc0a6ed9f4e8d
-  data.tar.gz: 6b9d3b228d2b45ee20a62a2870f8f20a81bbce3a6d64c13c3fe5030e6a305880
+  metadata.gz: 736978270f8fcab622906f32cd12201ae0b25f067f603645d7fd02e1ef68943c
+  data.tar.gz: 749239201b608a3a022442a405fee7c1cb822833bb6de1f5df8430e05e7b8038
 SHA512:
-  metadata.gz: 2fb910a6048022cdc49c0abe2a5f75808a616ae15c92fd5d3b71f694bd254b55c86d02fe9dd378b5477bdc83fcc9d32fe2901b81a0694cfa26c8d93549fef715
-  data.tar.gz: 4b81fbff0ad9dc1465f564e28859a20ebabc2a93374812bebc9d719d6fa4ed635669994eeb43bb2b45520596d32aeae93111ee0ccab12be217dc5c13d9fdda01
+  metadata.gz: ec2d6139649e4c47bef290fa8c82c68ac8e150465d14fcc519e07f1f82e313df89fbab78be934c4a64a7830c9653103752261f0550f77ca5dc11f72f7e2c92b5
+  data.tar.gz: ff6043536ef4d9a0a8ac23fb17ca228fc9079c0236814d75675c66de3e96cbe2269d4e39477ab558994ef938ea403227d9ae674125d19404c993f6ee937463bc

data/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/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/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: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.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
@@ -194,9 +194,10 @@ files:
 - template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/instances/deploy/config/secrets.yml
 - template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template
-- template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup
+- template/avm/eac_redmine_base0/instances/docker_image/apache_host_dockerfile
 - template/avm/eac_redmine_base0/instances/docker_image/apache_http_virtualhost.conf.template
 - template/avm/eac_redmine_base0/instances/docker_image/apache_https_virtualhost.conf.template
+- template/avm/eac_redmine_base0/instances/docker_image/apache_path_dockerfile
 - template/avm/eac_redmine_base0/instances/docker_image/start.sh.template
 homepage: 
 licenses: []