avm-eac_redmine_base0 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5667c3c6f10b76812ba085734ad08b16976a8506960eeb8a4fbfba1efb7c8292
-  data.tar.gz: ca54244f4a414e4dd374b1b73aab33ef48ba518d8b1beecbc81a14a8b6bf31cd
+  metadata.gz: c261124725288404e3dd58493cb4a798594a3a16ae6a2f27896e68d0f16028ff
+  data.tar.gz: 8a921bff830b06d7d02eb9324653175d2f5d385dbfd0825029c35748d972e2c7
 SHA512:
-  metadata.gz: e27d0a8b096151f3744aae1bfdfd6883ed36f53cc0b99b3885126e2f3e96d9dd7669c7402b998e944a8a07dde0ca255c4d747ca139ad7abb895cad20e4a4d616
-  data.tar.gz: 140ae0189029862567373276c78de8d3a05b8125239900523cf8a5fd5b53c154a857c489862aed141e4200cb9984840af8ae4dd9eca749619a28f3ea6802b088
+  metadata.gz: f44a29e6480541745fa3e810f85e1e677adfb4cb37ae96093034e34f612fce3f4fb1b8e2cfcd58b7804437cd409d62c4f48e15cec8533c3635ec738fdf95fa18
+  data.tar.gz: fb3f6b90e94b07c240cc0826890201ba613906df7a7ab39d8106e9466cf2de3ce95da49f6f1d05a7e47f94d9df28618011bb1eca04e78d1b95f606b43bd9d89f

data/lib/avm/eac_redmine_base0/core_update.rb

@@ -36,6 +36,10 @@ module Avm
         infov 'Package size', source_package.path.size
       end
 
+      def fs_object_id
+        [instance.id, version].join('_').variableize
+      end
+
       private
 
       attr_reader :tempdir
@@ -76,7 +80,7 @@ module Avm
 
       def sync_content
         ::Avm::Sync.new(source_path, target_path)
-                   .add_exclude('/*').add_includes(*target_files_to_remove).move_mode(true).run
+          .add_exclude('/*').add_includes(*target_files_to_remove).move_mode(true).run
       end
 
       # @return [EacFs::CachedDownload]
@@ -99,8 +103,8 @@ module Avm
 
       def target_files_to_remove
         git_repo.command('ls-files').execute!
-                .each_line.map { |v| "/#{v.strip}" }
-                .without(*TARGET_KEEP)
+          .each_line.map { |v| "/#{v.strip}" }
+          .without(*TARGET_KEEP)
       end
 
       def target_path_uncached

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

@@ -12,7 +12,8 @@ module Avm
         enable_simple_cache
 
         BASE_IMAGE = 'ubuntu:20.04'
-        INSTALLER_TARGET_TASK = 'redmine_as_apache_base'
+        INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
+        INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
         DATABASE_INTERNAL_HOSTNAME = 'localhost'
         REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
 
@@ -20,6 +21,12 @@ module Avm
           instance.id
         end
 
+        def apache_setup
+          return '' if web_path_present?
+
+          template.child('Dockerfile_apache_setup').apply(self)
+        end
+
         def base_image
           eac_ubuntu_base0_instance.docker_image.provide.id
         end
@@ -30,7 +37,11 @@ module Avm
         end
 
         def installer_target_task
-          INSTALLER_TARGET_TASK
+          if web_path_present?
+            INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT
+          else
+            INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK
+          end
         end
 
         def redmine_user
@@ -53,6 +64,10 @@ module Avm
           '/start.sh'
         end
 
+        def web_path_present?
+          ::Addressable::URI.parse(instance.web_url).path.present?
+        end
+
         private
 
         def eac_ubuntu_base0_instance

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class Base < ::Avm::EacRailsBase1::Sources::Base
+        REDMINE_LIB_SUBPATH = 'lib/redmine.rb'
+        SUBS_PATHS_DEFAULT = ['plugins/*'].freeze
+
+        def redmine_lib_path
+          path.join(REDMINE_LIB_SUBPATH)
+        end
+
+        def subs_paths_default
+          SUBS_PATHS_DEFAULT
+        end
+
+        def valid?
+          super && redmine_lib_path.exist?
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template

@@ -22,19 +22,13 @@ RUN SKIP_DATABASE='%%skip_database%%' \
   '%%redmine_path%%/plugins/redmine_installer/installer/run.sh' '%%installer_target_task%%'
 
 # Apache / Configuração do virtualhost
-COPY apache_http_virtualhost.conf /etc/apache2/sites-available/redmine.conf
-COPY apache_https_virtualhost.conf /etc/apache2/sites-available/redmine_ssl.conf
-USER root
-RUN a2ensite redmine
-RUN a2ensite redmine_ssl
-RUN a2dissite 000-default
-RUN a2enmod ssl
-RUN service apache2 restart
+%%apache_setup%%
 
 # Portas
 EXPOSE 80/tcp 443/tcp 22/tcp
 
 # Execução
+USER root
 COPY start.sh '%%start_path%%'
 RUN /bin/chmod +x '%%start_path%%'
 RUN /bin/chown '%%redmine_user%%:%%redmine_user%%' '%%start_path%%'

data/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup

@@ -0,0 +1,8 @@
+COPY apache_http_virtualhost.conf /etc/apache2/sites-available/redmine.conf
+COPY apache_https_virtualhost.conf /etc/apache2/sites-available/redmine_ssl.conf
+USER root
+RUN a2ensite redmine
+RUN a2ensite redmine_ssl
+RUN a2dissite 000-default
+RUN a2enmod ssl
+RUN service apache2 restart

data/template/avm/eac_redmine_base0/instances/docker_image/start.sh.template

@@ -34,7 +34,7 @@ function postgresql_start() {
 
 function request_http_interface() {
   title 'Requesting web interface...'
-  wget 'http://localhost' &> /dev/null
+  wget 'http://localhost%%web.path%%' &> /dev/null
 }
 
 function redmine_log() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.1
 description: 
 email: 
 executables: []
@@ -122,10 +122,12 @@ files:
 - lib/avm/eac_redmine_base0/instance.rb
 - lib/avm/eac_redmine_base0/instances/docker_image.rb
 - lib/avm/eac_redmine_base0/rest_api.rb
+- lib/avm/eac_redmine_base0/sources/base.rb
 - lib/avm/eac_redmine_base0/version.rb
 - template/avm/eac_redmine_base0/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/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_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/install_settings.sh.template