avm-eac_redmine_base0 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3edea2dd7d4873027f596ad883f82e0e30bb2f23841fd42a23134bcdf519890
-  data.tar.gz: e5db50775a599528dd6fd5dfaf4e8f62ed51c0f838cd74e971af93d6781ef1ba
+  metadata.gz: 8b987dbc4f8c46c0c47686c18836edc0e66248b4b8c95c1f7248e78873c1bb1a
+  data.tar.gz: 5b2c221d19087d68ae47dee4c1049ece0c56b96ef5117c7f8fce6293b590a64c
 SHA512:
-  metadata.gz: c95cf0dcb0dd4aff45cdf5fe3e3cae2e1fd2b6fa3420ab4f77b280066b65ba2a5b50d83014c3bebf0c9f3153b4114971614810ca2cf77dfd5705cbfcd83be52f
-  data.tar.gz: a568328e4a57e311f91c18526e877f440973baeb1ada4445b990145ee77585942c8ef885e8d7afed65647d1f755c8215ef3e3a3781601d68c54f48e189291f76
+  metadata.gz: 3ceb1d3692e836b0a70a40bab4eec5eafbd0ccc09a51820021782182ecae0eba00f0f45c35501e5e35f71e15ab4a06840090383c60e3ca26e9310d06d801baf9
+  data.tar.gz: 3c187a07fea483e6afff45ca625e62028fa50b13351dac1c51b4cdde8b1684351dcd3ccd3c74066027e276aa58f7db6f908b6a392f71250524ee397aba856150

data/lib/avm/eac_redmine_base0/instances/base/database.rb

@@ -8,8 +8,8 @@ module Avm
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
         module Database
-          DATABASE_INTERNAL_HOSTNAME = 'localhost'
-          DEFAULT_POSTGRESQL_VERSION = '12'
+          DATABASE_INTERNAL_HOSTNAME = ::Avm::Instances::Base::AutoValues::Database::LOCAL_ADDRESS
+          DEFAULT_POSTGRESQL_VERSION = ''
 
           common_concern do
             uri_components_entries_values 'postgresql', %w[version]

data/lib/avm/eac_redmine_base0/instances/base/nodejs.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        module Nodejs
+          DEFAULT_NODEJS_VERSION = '19.8.1'
+          NODEJS_VERSION_KEY = 'nodejs.version'
+
+          def auto_install_nodejs_version
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, NODEJS_VERSION_KEY) ||
+              DEFAULT_NODEJS_VERSION
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,14 +6,17 @@ require 'avm/eac_redmine_base0/instances/docker_image'
 require 'avm/eac_redmine_base0/instances/runners'
 require 'avm/eac_redmine_base0/instances/rest_api'
 require 'avm/eac_rails_base1/instances/base'
+require 'avm/eac_ruby_base1/instances/mixin'
 
 module Avm
   module EacRedmineBase0
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
-        require_sub __FILE__, include_modules: true
+        require_sub __FILE__, include_modules: true, require_dependency: true
         enable_simple_cache
 
+        include ::Avm::EacRubyBase1::Instances::Mixin
+
         def docker_image_class
           ::Avm::EacRedmineBase0::Instances::DockerImage
         end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'avm/eac_redmine_base0/instances/deploy'
 require 'avm/eac_ubuntu_base0/instances/base'
 require 'avm/instances/docker_image'
 require 'eac_templates/core_ext'
@@ -63,6 +64,14 @@ module Avm
           ::Addressable::URI.parse(instance.web_url).path.present?
         end
 
+        def write_in_provide_dir
+          super
+
+          ::Avm::EacRedmineBase0::Instances::Deploy.template.child('config')
+            .child('install.sh.template')
+            .apply_to_file(variables_source, provide_dir.join('install_settings.sh'))
+        end
+
         private
 
         def eac_ubuntu_base0_instance

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/eac_redmine_base0/instances/deploy'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.18.1'
+    VERSION = '0.19.0'
   end
 end

data/locale/en.yml

@@ -1,5 +1,6 @@
 en:
   avm:
     eac_redmine_base0:
-      core_update:
-        git_commit_message: "Core: update to '%{version}'."
+      sources:
+        core_update:
+          git_commit_message: "Core: update to '%{version}'."

data/locale/pt-BR.yml

@@ -1,5 +1,6 @@
 pt-BR:
   avm:
     eac_redmine_base0:
-      core_update:
-        git_commit_message: "Core: atualiza para '%{version}'."
+      sources:
+        core_update:
+          git_commit_message: "Core: atualiza para '%{version}'."

data/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template

@@ -1,5 +1,8 @@
 # Ruby
-export rvm_ruby='ruby-%%RUBY.VERSION%%'
+export ruby_version='%%INSTALL.RUBY.VERSION%%'
+
+# NodeJs
+export nodejs_version='%%INSTALL.NODEJS.VERSION%%'
 
 # Database
 export postgresql_internal='%%DATABASE_INTERNAL%%'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.66'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.64.1
+        version: 0.66.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.66'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.64.1
+        version: 0.66.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,6 +61,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +127,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,7 +137,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +180,7 @@ files:
 - lib/avm/eac_redmine_base0/instances/base/files.rb
 - lib/avm/eac_redmine_base0/instances/base/gitolite.rb
 - lib/avm/eac_redmine_base0/instances/base/install.rb
+- lib/avm/eac_redmine_base0/instances/base/nodejs.rb
 - lib/avm/eac_redmine_base0/instances/base/web.rb
 - lib/avm/eac_redmine_base0/instances/data_package.rb
 - lib/avm/eac_redmine_base0/instances/deploy.rb
@@ -197,7 +204,6 @@ files:
 - 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
 - template/avm/eac_redmine_base0/instances/docker_image/start.sh.template
 homepage: 
 licenses: []

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

@@ -1,33 +0,0 @@
-# Database
-export postgresql_internal='%%database_internal%%'
-export postgresql_host='%%DATABASE.HOSTNAME%%'
-export postgresql_port='%%DATABASE.PORT%%'
-export postgresql_user='%%DATABASE.USERNAME%%'
-export postgresql_password='%%DATABASE.PASSWORD%%'
-export postgresql_database='%%DATABASE.NAME%%'
-export postgresql_extra_settings='%%DATABASE.EXTRA%%'
-
-# Git Hosting
-export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
-export git_repositories_hierarchical_organisation=false
-
-# Web
-if [ '%%WEB.SCHEME%%' == 'https' ]; then
-  export address_https='true'
-else
-  export address_https='false'
-fi
-export address_host='%%WEB.AUTHORITY%%'
-export address_path='%%WEB.PATH%%'
-
-# Mail settings
-export smtp_server='%%MAILER.SMTP.ADDRESS%%'
-export smtp_port='%%MAILER.SMTP.PORT%%'
-export smtp_domain='%%MAILER.SMTP.DOMAIN%%'
-export smtp_tls='%%MAILER.SMTP.TLS%%'
-export smtp_enable_starttls_auto='%%MAILER.SMTP.STARTTLS_AUTO%%'
-export smtp_openssl_verify_mode='%%MAILER.SMTP.OPENSSL_VERIFY_MODE%%'
-export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
-export smtp_username='%%MAILER.SMTP.USERNAME%%'
-export smtp_password='%%MAILER.SMTP.PASSWORD%%'
-export mail_from='%%MAILER.FROM%%'