avm-eac_redmine_base0 0.15.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b0062b4f8d1bea44ec567461cbee96a017d3cd070b8fe773d4dcb69fa5c8966
-  data.tar.gz: 8338fc718b9740f62102b7a7a81d9b6a936a293bb9dd2e9b9645601184628212
+  metadata.gz: 64093513b7ff3ab871760d20832081528a1d712737b9b8c4bb0578bc617a2d5e
+  data.tar.gz: 0d022489c9a621563cf50b2d38b0a84a73e3fcf12143ed0db67b0d018f752ba3
 SHA512:
-  metadata.gz: 32608264f08bff25804ccd35434f8ee1b14e95a0b7bc6bea6e5ce3e0441dd947a026b7d6d71ee37cddb7aaf6be29a63dd9d33e54e68e3a5cd31b0707393ff6d3
-  data.tar.gz: c6395a3dd175f38e32b739a45f46250657675fd9c5d2d1eedf8abcc465a67227f49bc785c8515173158aa594ab5ae415f85764281062730b0a6b75f97831c400
+  metadata.gz: a126cf301907db16a287b7b358b6b3454defa07fc447aa71df9ccab351af18410a7116944690dbcfb6161f497afe8b9f95cf1076eb006f2d2923dc62005f88f2
+  data.tar.gz: a657c0c06683259f03c39821da2ca0a0f8fbedbdd67000cfe64fda7997e1e19240509ad0cc68c27e00728d5a2890a82239f9047955e73d04d46224e29c475829

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base1/apache_host'
+require 'avm/eac_rails_base1/instances/apache_host'
 
 module Avm
   module EacRedmineBase0
     module Instances
-      class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
+      class ApacheHost < ::Avm::EacRailsBase1::Instances::ApacheHost
       end
     end
   end

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

@@ -0,0 +1,30 @@
+# 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 Database
+          DATABASE_INTERNAL_HOSTNAME = 'localhost'
+          DEFAULT_POSTGRESQL_VERSION = '12'
+
+          common_concern do
+            uri_components_entries_values 'postgresql', %w[version]
+          end
+
+          def database_internal
+            entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value ==
+              DATABASE_INTERNAL_HOSTNAME
+          end
+
+          def postgresql_version_default_value
+            DEFAULT_POSTGRESQL_VERSION
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# 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 Gitolite
+          GITOLITE_ENTRY_KEYS_PREFIX = 'gitolite'
+          DEFAULT_HOSTNAME = 'localhost'
+          DEFAULT_PATH_PARENT = '/var/lib'
+          DEFAULT_SCHEME = 'file'
+          DEFAULT_USERNAME = 'git'
+
+          common_concern do
+            uri_components_entries_values GITOLITE_ENTRY_KEYS_PREFIX
+          end
+
+          def gitolite_hostname_default_value
+            DEFAULT_HOSTNAME
+          end
+
+          def gitolite_path_default_value
+            read_entry_optional([GITOLITE_ENTRY_KEYS_PREFIX, 'username']).if_present do |v|
+              ::File.join(DEFAULT_PATH_PARENT, v)
+            end
+          end
+
+          def gitolite_scheme_default_value
+            DEFAULT_SCHEME
+          end
+
+          def gitolite_username_default_value
+            DEFAULT_USERNAME
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# 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 Web
+          def web_authority
+            web_hostname.if_present do |h|
+              h.to_s + web_port_optional.if_present('') { |p| ":#{p}" }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module Avm
   module EacRedmineBase0
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
+        require_sub __FILE__, include_modules: true
         enable_simple_cache
 
         FILES_UNITS = { files: 'files' }.freeze

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/instances/deploy'
 require 'eac_ruby_utils/ruby'
 
 module Avm
   module EacRedmineBase0
     module Instances
-      class Deploy < ::Avm::EacWebappBase0::Deploy
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
         set_callback :assert_instance_branch, :after, :run_installer
 
         def run_installer

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

@@ -14,9 +14,10 @@ module Avm
         BASE_IMAGE = 'ubuntu:20.04'
         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'
 
+        delegate :database_internal, to: :instance
+
         def avm_fs_cache_object_id
           instance.id
         end
@@ -31,11 +32,6 @@ module Avm
           eac_ubuntu_base0_instance.docker_image.provide.id
         end
 
-        def database_internal
-          instance.entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value ==
-            DATABASE_INTERNAL_HOSTNAME
-        end
-
         def installer_target_task
           if web_path_present?
             INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.15.0'
+    VERSION = '0.16.1'
   end
 end

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

@@ -1,10 +1,17 @@
+# Ruby
+export rvm_ruby='ruby-%%RUBY.VERSION%%'
+
+# Database
+export postgresql_internal='%%DATABASE_INTERNAL%%'
+export postgresql_host='%%DATABASE.HOSTNAME%%'
+export postgresql_port='%%DATABASE.PORT%%'
 export postgresql_database='%%DATABASE.NAME%%'
-export postgresql_database_test='%%DATABASE.NAME%%_test'
 export postgresql_user='%%DATABASE.USERNAME%%'
 export postgresql_password='%%DATABASE.PASSWORD%%'
 export postgresql_version='%%POSTGRESQL.VERSION%%'
-export rvm_ruby='ruby-%%RUBY.VERSION%%'
-export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
+export postgresql_extra_settings='%%DATABASE.EXTRA%%'
+
+# Web
 if [ '%%WEB.SCHEME%%' == 'https' ]; then
   export address_https='true'
 else
@@ -15,8 +22,9 @@ export address_path='%%WEB.PATH%%'
 
 # Git
 export git_repositories_hierarchical_organisation=false
-export gitolite_user='%%GIT.USERNAME%%'
-export gitolite_user_home="/var/lib/${gitolite_user}"
+export gitolite_user='%%GITOLITE.USERNAME%%'
+export gitolite_user_home='%%GITOLITE.PATH%%'
+export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
 
 # Mail settings
 export smtp_server='%%MAILER.SMTP.ADDRESS%%'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,42 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: eac_rest
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.103'
+        version: '0.107'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.107.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.103'
+        version: '0.107'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.107.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +170,9 @@ files:
 - lib/avm/eac_redmine_base0/instances.rb
 - lib/avm/eac_redmine_base0/instances/apache_host.rb
 - lib/avm/eac_redmine_base0/instances/base.rb
+- lib/avm/eac_redmine_base0/instances/base/database.rb
+- lib/avm/eac_redmine_base0/instances/base/gitolite.rb
+- lib/avm/eac_redmine_base0/instances/base/web.rb
 - lib/avm/eac_redmine_base0/instances/data_unit.rb
 - lib/avm/eac_redmine_base0/instances/deploy.rb
 - lib/avm/eac_redmine_base0/instances/docker_image.rb