eac_tools 0.55.6 → 0.55.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +24 -24
  3. data/lib/eac_tools/version.rb +1 -1
  4. data/sub/avm/lib/avm/instances/base/auto_values/database.rb +12 -27
  5. data/sub/avm/lib/avm/version.rb +1 -1
  6. data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec +2 -2
  7. data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb +1 -1
  8. data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec +4 -4
  9. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/base.rb +3 -0
  10. data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb +1 -1
  11. data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec +3 -3
  12. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/database.rb +2 -2
  13. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb +4 -1
  14. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb +9 -0
  15. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners.rb +1 -0
  16. data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb +1 -1
  17. data/sub/avm-eac_redmine_base0/locale/en.yml +3 -2
  18. data/sub/avm-eac_redmine_base0/locale/pt-BR.yml +3 -2
  19. data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec +3 -3
  20. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/instances/mixin.rb +19 -0
  21. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/instances.rb +11 -0
  22. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb +1 -1
  23. metadata +21 -21
  24. data/sub/avm/lib/avm/instances/base/auto_values/ruby.rb +0 -15
  25. data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/install_settings.sh.template +0 -33
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e176be2d8f0c9e29fbc9ba3503447a80c898236928ee978f1f8e76654d9e9a72
4
- data.tar.gz: 1dac337bac73121e65ac2860f120188db5346e432d482e1ee14bfe4fffb1f815
3
+ metadata.gz: 3b4986d5d4f203b2446bf15351a22b29701c9f3f467afee4e2e5fd557a7b15f3
4
+ data.tar.gz: 3f277827e7f8880fce8c95a1d5bd21529763e786e8c6edf4e070b04762a531f0
5
5
  SHA512:
6
- metadata.gz: 56d88118b427b4287d6927928c4ad0c8b86f1c237630509ded2447e31cbd591333e32fb30093eb48f3f492070d124fae570b91644bff53dbf23611c1fefdc8c5
7
- data.tar.gz: 516158a86f663a07d2ed65915ca4f8434e823a7bbfbd429f83c515cb1a3a3052d10549693c50c92d78862b0ce63af8425adde0c1efab0f214e9709171d21d1bd
6
+ metadata.gz: 5d6de889f5814a26b52abb0c77135d7eb173333fc9c35fc2a1d5a043cefc6624018fc2fe7897cc4eba0fb94e219b02538623c9e8689d32c0e735b8d99e1587c5
7
+ data.tar.gz: 27a49cabf562f3ca549f171a3c3b29d4587dcf16a94887f95980f135bc63dd7222c6f75e9a8d3b568bcba08e022b067a3f9867919d30a5b3ec54f7737f24246d
data/Gemfile.lock CHANGED
@@ -1,19 +1,19 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- eac_tools (0.55.6)
5
- avm (~> 0.64, >= 0.64.2)
4
+ eac_tools (0.55.7)
5
+ avm (~> 0.65)
6
6
  avm-eac_asciidoctor_base0 (~> 0.15)
7
7
  avm-eac_generic_base0 (~> 0.11)
8
8
  avm-eac_latex_base0 (~> 0.3)
9
9
  avm-eac_php_base0 (~> 0.4, >= 0.4.1)
10
10
  avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
11
11
  avm-eac_python_base0 (~> 0.2, >= 0.2.1)
12
- avm-eac_rails_base0 (~> 0.9)
13
- avm-eac_rails_base1 (~> 0.8)
14
- avm-eac_redmine_base0 (~> 0.18, >= 0.18.1)
12
+ avm-eac_rails_base0 (~> 0.9, >= 0.9.1)
13
+ avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
14
+ avm-eac_redmine_base0 (~> 0.18, >= 0.18.2)
15
15
  avm-eac_redmine_plugin_base0 (~> 0.4)
16
- avm-eac_ruby_base1 (~> 0.29, >= 0.29.2)
16
+ avm-eac_ruby_base1 (~> 0.30)
17
17
  avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
18
18
  avm-eac_wordpress_base0 (~> 0.3)
19
19
  avm-git (~> 0.13, >= 0.13.1)
@@ -84,30 +84,30 @@ PATH
84
84
  PATH
85
85
  remote: sub/avm-eac_rails_base0
86
86
  specs:
87
- avm-eac_rails_base0 (0.9.0)
88
- avm-eac_rails_base1 (~> 0.8)
89
- eac_ruby_utils (~> 0.109)
87
+ avm-eac_rails_base0 (0.9.1)
88
+ avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
89
+ eac_ruby_utils (~> 0.112)
90
90
 
91
91
  PATH
92
92
  remote: sub/avm-eac_rails_base1
93
93
  specs:
94
- avm-eac_rails_base1 (0.8.0)
95
- avm (~> 0.57)
96
- avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
97
- avm-eac_webapp_base0 (~> 0.13)
98
- eac_ruby_utils (~> 0.109)
94
+ avm-eac_rails_base1 (0.8.1)
95
+ avm (~> 0.65)
96
+ avm-eac_ruby_base1 (~> 0.30)
97
+ avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
98
+ eac_ruby_utils (~> 0.112)
99
99
 
100
100
  PATH
101
101
  remote: sub/avm-eac_redmine_base0
102
102
  specs:
103
- avm-eac_redmine_base0 (0.18.1)
104
- avm (~> 0.64, >= 0.64.1)
103
+ avm-eac_redmine_base0 (0.18.2)
104
+ avm (~> 0.65)
105
105
  avm-eac_generic_base0 (~> 0.11)
106
- avm-eac_rails_base1 (~> 0.8)
106
+ avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
107
107
  avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
108
108
  curb (~> 0.9, >= 0.9.11)
109
109
  eac_fs (~> 0.16)
110
- eac_rest (~> 0.7, >= 0.7.2)
110
+ eac_rest (~> 0.7, >= 0.7.3)
111
111
  eac_ruby_utils (~> 0.112)
112
112
 
113
113
  PATH
@@ -120,10 +120,10 @@ PATH
120
120
  PATH
121
121
  remote: sub/avm-eac_ruby_base1
122
122
  specs:
123
- avm-eac_ruby_base1 (0.29.2)
124
- aranha-parsers (~> 0.16)
125
- avm (~> 0.63)
126
- avm-eac_generic_base0 (~> 0.10)
123
+ avm-eac_ruby_base1 (0.30.0)
124
+ aranha-parsers (~> 0.17)
125
+ avm (~> 0.65)
126
+ avm-eac_generic_base0 (~> 0.11)
127
127
  eac_ruby_utils (~> 0.112)
128
128
 
129
129
  PATH
@@ -194,7 +194,7 @@ PATH
194
194
  PATH
195
195
  remote: sub/avm
196
196
  specs:
197
- avm (0.64.2)
197
+ avm (0.65.0)
198
198
  aranha-parsers (~> 0.17)
199
199
  eac_cli (~> 0.30, >= 0.30.1)
200
200
  eac_config (~> 0.12)
@@ -353,7 +353,7 @@ GEM
353
353
  rspec-expectations (3.12.2)
354
354
  diff-lcs (>= 1.2.0, < 2.0)
355
355
  rspec-support (~> 3.12.0)
356
- rspec-mocks (3.12.4)
356
+ rspec-mocks (3.12.5)
357
357
  diff-lcs (>= 1.2.0, < 2.0)
358
358
  rspec-support (~> 3.12.0)
359
359
  rspec-support (3.12.0)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacTools
4
- VERSION = '0.55.6'
4
+ VERSION = '0.55.7'
5
5
  end
@@ -7,8 +7,9 @@ module Avm
7
7
  class Base
8
8
  module AutoValues
9
9
  module Database
10
+ LOCAL_ADDRESS = '127.0.0.1'
10
11
  DEFAULT_EXTRA = ''
11
- DEFAULT_HOSTNAME = '127.0.0.1'
12
+ DEFAULT_HOSTNAME = LOCAL_ADDRESS
12
13
  DEFAULT_LIMIT = 5
13
14
  DEFAULT_PORTS = {
14
15
  'postgresql' => 5432,
@@ -19,8 +20,16 @@ module Avm
19
20
  DEFAULT_SYSTEM = 'postgresql'
20
21
  DEFAULT_TIMEOUT = 5000
21
22
 
22
- def auto_database_extra
23
- database_auto_common('hostname') || DEFAULT_EXTRA
23
+ %w[extra hostname limit system timeout].each do |attr|
24
+ define_method "auto_database_#{attr}" do
25
+ database_auto_common(attr) || self.class.const_get("default_#{attr}".upcase)
26
+ end
27
+ end
28
+
29
+ %w[username password].each do |attr|
30
+ define_method "auto_database_#{attr}" do
31
+ database_auto_common(attr) || id
32
+ end
24
33
  end
25
34
 
26
35
  def auto_database_name
@@ -28,34 +37,10 @@ module Avm
28
37
  ::Avm::Instances::EntryKeys::DATABASE_NAME) || id
29
38
  end
30
39
 
31
- def auto_database_hostname
32
- database_auto_common('hostname') || DEFAULT_HOSTNAME
33
- end
34
-
35
- def auto_database_limit
36
- database_auto_common('limit') || DEFAULT_LIMIT
37
- end
38
-
39
- def auto_database_password
40
- database_auto_common('password') || id
41
- end
42
-
43
40
  def auto_database_port
44
41
  database_auto_common('port') || database_port_by_system
45
42
  end
46
43
 
47
- def auto_database_username
48
- database_auto_common('username') || id
49
- end
50
-
51
- def auto_database_system
52
- database_auto_common('system') || DEFAULT_SYSTEM
53
- end
54
-
55
- def auto_database_timeout
56
- database_auto_common('timeout') || DEFAULT_TIMEOUT
57
- end
58
-
59
44
  private
60
45
 
61
46
  def database_auto_common(suffix)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Avm
4
- VERSION = '0.64.2'
4
+ VERSION = '0.65.0'
5
5
  end
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
- s.add_dependency 'avm-eac_rails_base1', '~> 0.8'
16
- s.add_dependency 'eac_ruby_utils', '~> 0.109'
15
+ s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.1'
16
+ s.add_dependency 'eac_ruby_utils', '~> 0.112'
17
17
 
18
18
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
19
19
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase0
5
- VERSION = '0.9.0'
5
+ VERSION = '0.9.1'
6
6
  end
7
7
  end
@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.57'
16
- s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.3'
17
- s.add_dependency 'avm-eac_webapp_base0', '~> 0.13'
18
- s.add_dependency 'eac_ruby_utils', '~> 0.109'
15
+ s.add_dependency 'avm', '~> 0.65'
16
+ s.add_dependency 'avm-eac_ruby_base1', '~> 0.30'
17
+ s.add_dependency 'avm-eac_webapp_base0', '~> 0.13', '>= 0.13.1'
18
+ s.add_dependency 'eac_ruby_utils', '~> 0.112'
19
19
 
20
20
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
21
21
  end
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'avm/eac_rails_base1/instances/runners'
4
+ require 'avm/eac_ruby_base1/instances/mixin'
4
5
  require 'avm/eac_ruby_base1/sources/base'
5
6
  require 'avm/eac_webapp_base0/instances/base'
6
7
 
@@ -8,6 +9,8 @@ module Avm
8
9
  module EacRailsBase1
9
10
  module Instances
10
11
  class Base < ::Avm::EacWebappBase0::Instances::Base
12
+ include ::Avm::EacRubyBase1::Instances::Mixin
13
+
11
14
  DEFAULT_RAILS_ENVIRONMENT = 'production'
12
15
 
13
16
  def bundle(*args)
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase1
5
- VERSION = '0.8.0'
5
+ VERSION = '0.8.1'
6
6
  end
7
7
  end
@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,locale,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.64', '>= 0.64.1'
15
+ s.add_dependency 'avm', '~> 0.65'
16
16
  s.add_dependency 'avm-eac_generic_base0', '~> 0.11'
17
- s.add_dependency 'avm-eac_rails_base1', '~> 0.8'
17
+ s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.1'
18
18
  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
19
19
  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
20
20
  s.add_dependency 'eac_fs', '~> 0.16'
21
- s.add_dependency 'eac_rest', '~> 0.7', '>= 0.7.2'
21
+ s.add_dependency 'eac_rest', '~> 0.7', '>= 0.7.3'
22
22
  s.add_dependency 'eac_ruby_utils', '~> 0.112'
23
23
 
24
24
  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
@@ -8,8 +8,8 @@ module Avm
8
8
  module Instances
9
9
  class Base < ::Avm::EacRailsBase1::Instances::Base
10
10
  module Database
11
- DATABASE_INTERNAL_HOSTNAME = 'localhost'
12
- DEFAULT_POSTGRESQL_VERSION = '12'
11
+ DATABASE_INTERNAL_HOSTNAME = ::Avm::Instances::Base::AutoValues::Database::LOCAL_ADDRESS
12
+ DEFAULT_POSTGRESQL_VERSION = ''
13
13
 
14
14
  common_concern do
15
15
  uri_components_entries_values 'postgresql', %w[version]
@@ -6,14 +6,17 @@ require 'avm/eac_redmine_base0/instances/docker_image'
6
6
  require 'avm/eac_redmine_base0/instances/runners'
7
7
  require 'avm/eac_redmine_base0/instances/rest_api'
8
8
  require 'avm/eac_rails_base1/instances/base'
9
+ require 'avm/eac_ruby_base1/instances/mixin'
9
10
 
10
11
  module Avm
11
12
  module EacRedmineBase0
12
13
  module Instances
13
14
  class Base < ::Avm::EacRailsBase1::Instances::Base
14
- require_sub __FILE__, include_modules: true
15
+ require_sub __FILE__, include_modules: true, require_dependency: true
15
16
  enable_simple_cache
16
17
 
18
+ include ::Avm::EacRubyBase1::Instances::Mixin
19
+
17
20
  def docker_image_class
18
21
  ::Avm::EacRedmineBase0::Instances::DockerImage
19
22
  end
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_ruby_utils/core_ext'
4
+ require 'avm/eac_redmine_base0/instances/deploy'
4
5
  require 'avm/eac_ubuntu_base0/instances/base'
5
6
  require 'avm/instances/docker_image'
6
7
  require 'eac_templates/core_ext'
@@ -63,6 +64,14 @@ module Avm
63
64
  ::Addressable::URI.parse(instance.web_url).path.present?
64
65
  end
65
66
 
67
+ def write_in_provide_dir
68
+ super
69
+
70
+ ::Avm::EacRedmineBase0::Instances::Deploy.template.child('config')
71
+ .child('install.sh.template')
72
+ .apply_to_file(variables_source, provide_dir.join('install_settings.sh'))
73
+ end
74
+
66
75
  private
67
76
 
68
77
  def eac_ubuntu_base0_instance
@@ -1,5 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'avm/eac_redmine_base0/instances/deploy'
3
4
  require 'eac_ruby_utils/core_ext'
4
5
 
5
6
  module Avm
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRedmineBase0
5
- VERSION = '0.18.1'
5
+ VERSION = '0.18.2'
6
6
  end
7
7
  end
@@ -1,5 +1,6 @@
1
1
  en:
2
2
  avm:
3
3
  eac_redmine_base0:
4
- core_update:
5
- git_commit_message: "Core: update to '%{version}'."
4
+ sources:
5
+ core_update:
6
+ git_commit_message: "Core: update to '%{version}'."
@@ -1,5 +1,6 @@
1
1
  pt-BR:
2
2
  avm:
3
3
  eac_redmine_base0:
4
- core_update:
5
- git_commit_message: "Core: atualiza para '%{version}'."
4
+ sources:
5
+ core_update:
6
+ git_commit_message: "Core: atualiza para '%{version}'."
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,locale,template}/**/*']
14
14
 
15
- s.add_dependency 'aranha-parsers', '~> 0.16'
16
- s.add_dependency 'avm', '~> 0.63'
17
- s.add_dependency 'avm-eac_generic_base0', '~> 0.10'
15
+ s.add_dependency 'aranha-parsers', '~> 0.17'
16
+ s.add_dependency 'avm', '~> 0.65'
17
+ s.add_dependency 'avm-eac_generic_base0', '~> 0.11'
18
18
  s.add_dependency 'eac_ruby_utils', '~> 0.112'
19
19
 
20
20
  s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
@@ -0,0 +1,19 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRubyBase1
7
+ module Instances
8
+ module Mixin
9
+ DEFAULT_RUBY_VERSION = '2.7.7'
10
+ RUBY_VERSION_KEY = 'ruby.version'
11
+
12
+ def auto_ruby_version
13
+ inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, RUBY_VERSION_KEY) ||
14
+ DEFAULT_RUBY_VERSION
15
+ end
16
+ end
17
+ end
18
+ end
19
+ end
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRubyBase1
7
+ module Instances
8
+ require_sub __FILE__
9
+ end
10
+ end
11
+ end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRubyBase1
5
- VERSION = '0.29.2'
5
+ VERSION = '0.30.0'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: eac_tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.55.6
4
+ version: 0.55.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Put here the authors
@@ -16,20 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.64'
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 0.64.2
19
+ version: '0.65'
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
26
23
  requirements:
27
24
  - - "~>"
28
25
  - !ruby/object:Gem::Version
29
- version: '0.64'
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: 0.64.2
26
+ version: '0.65'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: avm-eac_asciidoctor_base0
35
29
  requirement: !ruby/object:Gem::Requirement
@@ -139,6 +133,9 @@ dependencies:
139
133
  - - "~>"
140
134
  - !ruby/object:Gem::Version
141
135
  version: '0.9'
136
+ - - ">="
137
+ - !ruby/object:Gem::Version
138
+ version: 0.9.1
142
139
  type: :runtime
143
140
  prerelease: false
144
141
  version_requirements: !ruby/object:Gem::Requirement
@@ -146,6 +143,9 @@ dependencies:
146
143
  - - "~>"
147
144
  - !ruby/object:Gem::Version
148
145
  version: '0.9'
146
+ - - ">="
147
+ - !ruby/object:Gem::Version
148
+ version: 0.9.1
149
149
  - !ruby/object:Gem::Dependency
150
150
  name: avm-eac_rails_base1
151
151
  requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,9 @@ dependencies:
153
153
  - - "~>"
154
154
  - !ruby/object:Gem::Version
155
155
  version: '0.8'
156
+ - - ">="
157
+ - !ruby/object:Gem::Version
158
+ version: 0.8.1
156
159
  type: :runtime
157
160
  prerelease: false
158
161
  version_requirements: !ruby/object:Gem::Requirement
@@ -160,6 +163,9 @@ dependencies:
160
163
  - - "~>"
161
164
  - !ruby/object:Gem::Version
162
165
  version: '0.8'
166
+ - - ">="
167
+ - !ruby/object:Gem::Version
168
+ version: 0.8.1
163
169
  - !ruby/object:Gem::Dependency
164
170
  name: avm-eac_redmine_base0
165
171
  requirement: !ruby/object:Gem::Requirement
@@ -169,7 +175,7 @@ dependencies:
169
175
  version: '0.18'
170
176
  - - ">="
171
177
  - !ruby/object:Gem::Version
172
- version: 0.18.1
178
+ version: 0.18.2
173
179
  type: :runtime
174
180
  prerelease: false
175
181
  version_requirements: !ruby/object:Gem::Requirement
@@ -179,7 +185,7 @@ dependencies:
179
185
  version: '0.18'
180
186
  - - ">="
181
187
  - !ruby/object:Gem::Version
182
- version: 0.18.1
188
+ version: 0.18.2
183
189
  - !ruby/object:Gem::Dependency
184
190
  name: avm-eac_redmine_plugin_base0
185
191
  requirement: !ruby/object:Gem::Requirement
@@ -200,20 +206,14 @@ dependencies:
200
206
  requirements:
201
207
  - - "~>"
202
208
  - !ruby/object:Gem::Version
203
- version: '0.29'
204
- - - ">="
205
- - !ruby/object:Gem::Version
206
- version: 0.29.2
209
+ version: '0.30'
207
210
  type: :runtime
208
211
  prerelease: false
209
212
  version_requirements: !ruby/object:Gem::Requirement
210
213
  requirements:
211
214
  - - "~>"
212
215
  - !ruby/object:Gem::Version
213
- version: '0.29'
214
- - - ">="
215
- - !ruby/object:Gem::Version
216
- version: 0.29.2
216
+ version: '0.30'
217
217
  - !ruby/object:Gem::Dependency
218
218
  name: avm-eac_webapp_base0
219
219
  requirement: !ruby/object:Gem::Requirement
@@ -631,7 +631,6 @@ files:
631
631
  - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup
632
632
  - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_http_virtualhost.conf.template
633
633
  - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_https_virtualhost.conf.template
634
- - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/install_settings.sh.template
635
634
  - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/start.sh.template
636
635
  - sub/avm-eac_redmine_plugin_base0/Gemfile
637
636
  - sub/avm-eac_redmine_plugin_base0/avm-eac_redmine_plugin_base0.gemspec
@@ -665,6 +664,8 @@ files:
665
664
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats.rb
666
665
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base.rb
667
666
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base/file_resource_name.rb
667
+ - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/instances.rb
668
+ - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/instances/mixin.rb
668
669
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher.rb
669
670
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem.rb
670
671
  - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem/build.rb
@@ -1118,7 +1119,6 @@ files:
1118
1119
  - sub/avm/lib/avm/instances/base/auto_values/data.rb
1119
1120
  - sub/avm/lib/avm/instances/base/auto_values/database.rb
1120
1121
  - sub/avm/lib/avm/instances/base/auto_values/mailer.rb
1121
- - sub/avm/lib/avm/instances/base/auto_values/ruby.rb
1122
1122
  - sub/avm/lib/avm/instances/base/auto_values/source.rb
1123
1123
  - sub/avm/lib/avm/instances/base/dockerizable.rb
1124
1124
  - sub/avm/lib/avm/instances/base/entry_keys.rb
@@ -1,15 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Avm
4
- module Instances
5
- class Base
6
- module AutoValues
7
- module Ruby
8
- def auto_ruby_version
9
- inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'ruby.version')
10
- end
11
- end
12
- end
13
- end
14
- end
15
- end
@@ -1,33 +0,0 @@
1
- # Database
2
- export postgresql_internal='%%database_internal%%'
3
- export postgresql_host='%%DATABASE.HOSTNAME%%'
4
- export postgresql_port='%%DATABASE.PORT%%'
5
- export postgresql_user='%%DATABASE.USERNAME%%'
6
- export postgresql_password='%%DATABASE.PASSWORD%%'
7
- export postgresql_database='%%DATABASE.NAME%%'
8
- export postgresql_extra_settings='%%DATABASE.EXTRA%%'
9
-
10
- # Git Hosting
11
- export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
12
- export git_repositories_hierarchical_organisation=false
13
-
14
- # Web
15
- if [ '%%WEB.SCHEME%%' == 'https' ]; then
16
- export address_https='true'
17
- else
18
- export address_https='false'
19
- fi
20
- export address_host='%%WEB.AUTHORITY%%'
21
- export address_path='%%WEB.PATH%%'
22
-
23
- # Mail settings
24
- export smtp_server='%%MAILER.SMTP.ADDRESS%%'
25
- export smtp_port='%%MAILER.SMTP.PORT%%'
26
- export smtp_domain='%%MAILER.SMTP.DOMAIN%%'
27
- export smtp_tls='%%MAILER.SMTP.TLS%%'
28
- export smtp_enable_starttls_auto='%%MAILER.SMTP.STARTTLS_AUTO%%'
29
- export smtp_openssl_verify_mode='%%MAILER.SMTP.OPENSSL_VERIFY_MODE%%'
30
- export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
31
- export smtp_username='%%MAILER.SMTP.USERNAME%%'
32
- export smtp_password='%%MAILER.SMTP.PASSWORD%%'
33
- export mail_from='%%MAILER.FROM%%'