avm-eac_redmine_base0 0.19.0 → 0.19.2

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/eac_redmine_base0/instances/base.rb +5 -4
  3. data/lib/avm/eac_redmine_base0/instances/docker_image.rb +7 -2
  4. data/lib/avm/eac_redmine_base0/version.rb +1 -1
  5. data/template/avm/eac_redmine_base0/instances/docker_image/apache_path_dockerfile +5 -0
  6. metadata +8 -14
  7. data/lib/avm/eac_redmine_base0/instances/data_package.rb +0 -23
  8. /data/template/avm/eac_redmine_base0/instances/docker_image/{Dockerfile_apache_setup → apache_host_dockerfile} +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8b987dbc4f8c46c0c47686c18836edc0e66248b4b8c95c1f7248e78873c1bb1a
4
- data.tar.gz: 5b2c221d19087d68ae47dee4c1049ece0c56b96ef5117c7f8fce6293b590a64c
3
+ metadata.gz: 736978270f8fcab622906f32cd12201ae0b25f067f603645d7fd02e1ef68943c
4
+ data.tar.gz: 749239201b608a3a022442a405fee7c1cb822833bb6de1f5df8430e05e7b8038
5
5
  SHA512:
6
- metadata.gz: 3ceb1d3692e836b0a70a40bab4eec5eafbd0ccc09a51820021782182ecae0eba00f0f45c35501e5e35f71e15ab4a06840090383c60e3ca26e9310d06d801baf9
7
- data.tar.gz: 3c187a07fea483e6afff45ca625e62028fa50b13351dac1c51b4cdde8b1684351dcd3ccd3c74066027e276aa58f7db6f908b6a392f71250524ee397aba856150
6
+ metadata.gz: ec2d6139649e4c47bef290fa8c82c68ac8e150465d14fcc519e07f1f82e313df89fbab78be934c4a64a7830c9653103752261f0550f77ca5dc11f72f7e2c92b5
7
+ data.tar.gz: ff6043536ef4d9a0a8ac23fb17ca228fc9079c0236814d75675c66de3e96cbe2269d4e39477ab558994ef938ea403227d9ae674125d19404c993f6ee937463bc
data/lib/avm/eac_redmine_base0/instances/base.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'addressable/uri'
4
- require 'avm/eac_redmine_base0/instances/data_package'
5
4
  require 'avm/eac_redmine_base0/instances/docker_image'
6
5
  require 'avm/eac_redmine_base0/instances/runners'
7
6
  require 'avm/eac_redmine_base0/instances/rest_api'
@@ -31,9 +30,11 @@ module Avm
31
30
  ]
32
31
  end
33
32
 
34
- # @return [Avm::EacRedmineBase0::Instances::DataPackage]
35
- def data_package
36
- @data_package ||= ::Avm::EacRedmineBase0::Instances::DataPackage.new(self)
33
+ # @return [Avm::Instances::Data::Package]
34
+ def data_package_create
35
+ r = super.add_unit('files', files_data_unit).add_unit('gitolite', gitolite_data_unit)
36
+ r.after_load { instance.run_installer }
37
+ r
37
38
  end
38
39
 
39
40
  # @return [Addressable::URI]
data/lib/avm/eac_redmine_base0/instances/docker_image.rb CHANGED
@@ -12,6 +12,8 @@ module Avm
12
12
  class DockerImage < ::Avm::Instances::DockerImage
13
13
  enable_simple_cache
14
14
 
15
+ APACHE_HOST_DOCKERFILE_SUBPATH = 'apache_host_dockerfile'
16
+ APACHE_PATH_DOCKERFILE_SUBPATH = 'apache_path_dockerfile'
15
17
  INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
16
18
  INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
17
19
  REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
@@ -23,9 +25,12 @@ module Avm
23
25
  end
24
26
 
25
27
  def apache_setup
26
- return '' if web_path_present?
28
+ template.child(apache_setup_dockerfile).apply(self)
29
+ end
27
30
 
28
- template.child('Dockerfile_apache_setup').apply(self)
31
+ # @return [String]
32
+ def apache_setup_dockerfile
33
+ web_path_present? ? APACHE_PATH_DOCKERFILE_SUBPATH : APACHE_HOST_DOCKERFILE_SUBPATH
29
34
  end
30
35
 
31
36
  def base_image
data/lib/avm/eac_redmine_base0/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRedmineBase0
5
- VERSION = '0.19.0'
5
+ VERSION = '0.19.2'
6
6
  end
7
7
  end
data/template/avm/eac_redmine_base0/instances/docker_image/apache_path_dockerfile ADDED
@@ -0,0 +1,5 @@
1
+ USER root
2
+ RUN a2ensite 000-default
3
+ RUN a2ensite default-ssl
4
+ RUN a2enmod ssl
5
+ RUN service apache2 restart
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avm-eac_redmine_base0
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.19.0
4
+ version: 0.19.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Put here the authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-04-05 00:00:00.000000000 Z
11
+ date: 2023-04-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -16,20 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.66'
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 0.66.1
19
+ version: '0.67'
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.66'
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: 0.66.1
26
+ version: '0.67'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: avm-eac_generic_base0
35
29
  requirement: !ruby/object:Gem::Requirement
@@ -53,7 +47,7 @@ dependencies:
53
47
  version: '0.8'
54
48
  - - ">="
55
49
  - !ruby/object:Gem::Version
56
- version: 0.8.2
50
+ version: 0.8.3
57
51
  type: :runtime
58
52
  prerelease: false
59
53
  version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +57,7 @@ dependencies:
63
57
  version: '0.8'
64
58
  - - ">="
65
59
  - !ruby/object:Gem::Version
66
- version: 0.8.2
60
+ version: 0.8.3
67
61
  - !ruby/object:Gem::Dependency
68
62
  name: avm-eac_ubuntu_base0
69
63
  requirement: !ruby/object:Gem::Requirement
@@ -182,7 +176,6 @@ files:
182
176
  - lib/avm/eac_redmine_base0/instances/base/install.rb
183
177
  - lib/avm/eac_redmine_base0/instances/base/nodejs.rb
184
178
  - lib/avm/eac_redmine_base0/instances/base/web.rb
185
- - lib/avm/eac_redmine_base0/instances/data_package.rb
186
179
  - lib/avm/eac_redmine_base0/instances/deploy.rb
187
180
  - lib/avm/eac_redmine_base0/instances/docker_image.rb
188
181
  - lib/avm/eac_redmine_base0/instances/rest_api.rb
@@ -201,9 +194,10 @@ files:
201
194
  - template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template
202
195
  - template/avm/eac_redmine_base0/instances/deploy/config/secrets.yml
203
196
  - template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template
204
- - template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup
197
+ - template/avm/eac_redmine_base0/instances/docker_image/apache_host_dockerfile
205
198
  - template/avm/eac_redmine_base0/instances/docker_image/apache_http_virtualhost.conf.template
206
199
  - template/avm/eac_redmine_base0/instances/docker_image/apache_https_virtualhost.conf.template
200
+ - template/avm/eac_redmine_base0/instances/docker_image/apache_path_dockerfile
207
201
  - template/avm/eac_redmine_base0/instances/docker_image/start.sh.template
208
202
  homepage:
209
203
  licenses: []
data/lib/avm/eac_redmine_base0/instances/data_package.rb DELETED
@@ -1,23 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'avm/instances/data/package'
4
- require 'eac_ruby_utils/core_ext'
5
-
6
- module Avm
7
- module EacRedmineBase0
8
- module Instances
9
- class DataPackage < ::Avm::Instances::Data::Package
10
- after_load :run_installer
11
-
12
- def initialize(instance, options = {})
13
- super(instance, options.merge(units: options[:units].if_present({}).merge(
14
- database: instance.database_unit, files: instance.files_data_unit,
15
- gitolite: instance.gitolite_data_unit
16
- )))
17
- end
18
-
19
- delegate :run_installer, to: :instance
20
- end
21
- end
22
- end
23
- end