avm-eac_webapp_base0 0.18.1 → 0.18.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/eac_webapp_base0/executables.rb +1 -1
  3. data/lib/avm/eac_webapp_base0/instances/apache_base.rb +5 -0
  4. data/lib/avm/eac_webapp_base0/instances/apache_host.rb +2 -2
  5. data/lib/avm/eac_webapp_base0/instances/apache_path.rb +1 -5
  6. data/lib/avm/eac_webapp_base0/instances/base/apache.rb +44 -0
  7. data/lib/avm/eac_webapp_base0/instances/base.rb +0 -8
  8. data/lib/avm/eac_webapp_base0/instances/deploy/version.rb +1 -1
  9. data/lib/avm/eac_webapp_base0/instances/deploy.rb +1 -1
  10. data/lib/avm/eac_webapp_base0/instances/runners/apache_path.rb +2 -1
  11. data/lib/avm/eac_webapp_base0/version.rb +1 -1
  12. data/template/avm/eac_webapp_base0/instances/apache_path/default.conf +7 -9
  13. metadata +24 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 601b680bbca5e87118ef02ed575b54c2de088b27550667ccfab81e106006ae44
4
- data.tar.gz: 6a7a6069618c7adb10caa554272108bb11501dbe8a680cd2543225a075d07db1
3
+ metadata.gz: 0cacdf03556abe3a06f06c3dd6ab10736aa22ad23350486a490fb2f9b46f68c0
4
+ data.tar.gz: f4e6484240a369c2fc9665ea4bc6375e76a849528cf125f0d731c9d9c90ca9c2
5
5
  SHA512:
6
- metadata.gz: 5c9acf7e8303086269f43cb21debe7cf07b2e2124a517851df956f8d508cd0582bcbe8ff9f1d6eed871d564caa60bdf2ed58ba02f08d7abc971fcedfa7f63447
7
- data.tar.gz: 15952ef4c0b1b6e93507f1a7698ab5d08470e239bb36b48b85ed3375cdcfb9e0ff4a7a520a26832f7494a8e3ba0407453b9bbd376bdadce8c809f7ed9e278067
6
+ metadata.gz: 593361d0429aa201535381417b1e98072a5ed9c2275e9b182e43738759e641e859b9f3fab3f1e4a714a3f92b68bea6da97c92ad30c434f39c9cf686876e7641f
7
+ data.tar.gz: a4a2af14ef728e9969e87469a7dea3ab88dc624fa8f43df9b0d109dcc047c2ba31e6faaf19bb01d169f7bf02d82f23347601a23b0ce3bd081addbbd1cb328e33
data/lib/avm/eac_webapp_base0/executables.rb CHANGED
@@ -16,7 +16,7 @@ module Avm
16
16
  private
17
17
 
18
18
  %w[cssbeautify-cli js-beautify tidy].each do |program|
19
- define_method(program.underscore + '_uncached') do
19
+ define_method("#{program.underscore}_uncached") do
20
20
  env.executable(program, '--version')
21
21
  end
22
22
  end
data/lib/avm/eac_webapp_base0/instances/apache_base.rb CHANGED
@@ -9,6 +9,11 @@ module Avm
9
9
  module EacWebappBase0
10
10
  module Instances
11
11
  class ApacheBase
12
+ # @return [String]
13
+ def document_root
14
+ instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
15
+ end
16
+
12
17
  protected
13
18
 
14
19
  def reload_apache
data/lib/avm/eac_webapp_base0/instances/apache_host.rb CHANGED
@@ -17,7 +17,7 @@ module Avm
17
17
 
18
18
  def directory_extra_config
19
19
  instance.entry(APACHE_DIRECTORY_EXTRA_CONFIG_KEY).optional_value
20
- .if_present { |v| " #{v}\n" }
20
+ .if_present { |v| " #{v}\n" }
21
21
  end
22
22
 
23
23
  def no_ssl_site_content
@@ -65,7 +65,7 @@ module Avm
65
65
  end
66
66
 
67
67
  def ssl_site_uncached
68
- apache.site(no_ssl_site.name + '-le-ssl')
68
+ apache.site("#{no_ssl_site.name}-le-ssl")
69
69
  end
70
70
 
71
71
  def write_available_no_ssl_site
data/lib/avm/eac_webapp_base0/instances/apache_path.rb CHANGED
@@ -14,11 +14,7 @@ module Avm
14
14
 
15
15
  def content
16
16
  ::Avm::EacWebappBase0::Instances::ApachePath.template.child('default.conf')
17
- .apply(variables_source)
18
- end
19
-
20
- def document_root
21
- instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
17
+ .apply(variables_source)
22
18
  end
23
19
 
24
20
  def extra_content
data/lib/avm/eac_webapp_base0/instances/base/apache.rb ADDED
@@ -0,0 +1,44 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Avm
4
+ module EacWebappBase0
5
+ module Instances
6
+ class Base < ::Avm::Instances::Base
7
+ module Apache
8
+ common_concern
9
+
10
+ class_methods do
11
+ # @return [Class]
12
+ def apache_path_class
13
+ ancestors.lazy.map { |ancestor| apache_path_class_by_ancestor(ancestor) }
14
+ .find(&:present?) || raise("No apache patch class found for \"#{self}\"")
15
+ end
16
+
17
+ private
18
+
19
+ # @param ancestor [Module]
20
+ # @return [Class]
21
+ def apache_path_class_by_ancestor(ancestor)
22
+ "#{ancestor.name.deconstantize}::ApachePath".constantize
23
+ rescue ::NameError
24
+ nil
25
+ end
26
+ end
27
+
28
+ # @return [Class]
29
+ def apache_path_class
30
+ self.class.apache_path_class
31
+ end
32
+
33
+ # @return [Avm::EacUbuntuBase0::Apache::Resource, nil]
34
+ def apache_resource
35
+ %i[conf site]
36
+ .lazy
37
+ .map { |type| platform_instance.apache.send(type, install_apache_resource_name) }
38
+ .find(&:available?)
39
+ end
40
+ end
41
+ end
42
+ end
43
+ end
44
+ end
data/lib/avm/eac_webapp_base0/instances/base.rb CHANGED
@@ -16,14 +16,6 @@ module Avm
16
16
  include ::Avm::EacPostgresqlBase0::InstanceWith
17
17
  enable_simple_cache
18
18
 
19
- # @return [Avm::EacUbuntuBase0::Apache::Resource, nil]
20
- def apache_resource
21
- %i[conf site]
22
- .lazy
23
- .map { |type| platform_instance.apache.send(type, install_apache_resource_name) }
24
- .find(&:available?)
25
- end
26
-
27
19
  def run_subcommand(subcommand_class, argv)
28
20
  subcommand_class.create(
29
21
  argv: argv,
data/lib/avm/eac_webapp_base0/instances/deploy/version.rb CHANGED
@@ -13,7 +13,7 @@ module Avm
13
13
 
14
14
  def version_git_refs
15
15
  git_remote_hashs.select { |_name, sha1| sha1 == commit_reference }.keys
16
- .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
16
+ .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
17
17
  end
18
18
 
19
19
  def version_target_path
data/lib/avm/eac_webapp_base0/instances/deploy.rb CHANGED
@@ -43,7 +43,7 @@ module Avm
43
43
 
44
44
  def setup_files_units
45
45
  instance.data_package.units.values.map(&:installation_files_data).select(&:present?)
46
- .each { |unit_install| setup_files_unit(unit_install.key, unit_install.subpath) }
46
+ .each { |unit_install| setup_files_unit(unit_install.key, unit_install.subpath) }
47
47
  end
48
48
 
49
49
  def assert_instance_branch
data/lib/avm/eac_webapp_base0/instances/runners/apache_path.rb CHANGED
@@ -12,6 +12,7 @@ module Avm
12
12
  end
13
13
 
14
14
  def run
15
+ infov 'ApachePath class', stereotype_apache_path_class
15
16
  if result.error?
16
17
  fatal_error result.to_s
17
18
  else
@@ -30,7 +31,7 @@ module Avm
30
31
  end
31
32
 
32
33
  def stereotype_apache_path_class
33
- "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
34
+ runner_context.call(:instance).apache_path_class
34
35
  end
35
36
  end
36
37
  end
data/lib/avm/eac_webapp_base0/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacWebappBase0
5
- VERSION = '0.18.1'
5
+ VERSION = '0.18.3'
6
6
  end
7
7
  end
data/template/avm/eac_webapp_base0/instances/apache_path/default.conf CHANGED
@@ -1,9 +1,7 @@
1
- <IfModule mod_passenger.c>
2
- Alias "%%WEB.PATH%%" "%%DOCUMENT_ROOT%%"
3
- %%EXTRA_CONTENT%%
4
- <Directory "%%DOCUMENT_ROOT%%">
5
- Allow from all
6
- Options -MultiViews
7
- Require all granted
8
- </Directory>
9
- </IfModule>
1
+ Alias "%%WEB.PATH%%" "%%DOCUMENT_ROOT%%"
2
+ %%EXTRA_CONTENT%%
3
+ <Directory "%%DOCUMENT_ROOT%%">
4
+ Allow from all
5
+ Options -MultiViews
6
+ Require all granted
7
+ </Directory>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avm-eac_webapp_base0
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.1
4
+ version: 0.18.3
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-06-09 00:00:00.000000000 Z
11
+ date: 2023-11-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -16,14 +16,20 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.78'
19
+ version: '0.84'
20
+ - - ">="
21
+ - !ruby/object:Gem::Version
22
+ version: 0.84.2
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
27
  - - "~>"
25
28
  - !ruby/object:Gem::Version
26
- version: '0.78'
29
+ version: '0.84'
30
+ - - ">="
31
+ - !ruby/object:Gem::Version
32
+ version: 0.84.2
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: avm-eac_generic_base0
29
35
  requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
31
37
  - - "~>"
32
38
  - !ruby/object:Gem::Version
33
39
  version: '0.12'
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ version: 0.12.2
34
43
  type: :runtime
35
44
  prerelease: false
36
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
38
47
  - - "~>"
39
48
  - !ruby/object:Gem::Version
40
49
  version: '0.12'
50
+ - - ">="
51
+ - !ruby/object:Gem::Version
52
+ version: 0.12.2
41
53
  - !ruby/object:Gem::Dependency
42
54
  name: avm-eac_postgresql_base0
43
55
  requirement: !ruby/object:Gem::Requirement
@@ -47,7 +59,7 @@ dependencies:
47
59
  version: '0.5'
48
60
  - - ">="
49
61
  - !ruby/object:Gem::Version
50
- version: 0.5.1
62
+ version: 0.5.2
51
63
  type: :runtime
52
64
  prerelease: false
53
65
  version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +69,7 @@ dependencies:
57
69
  version: '0.5'
58
70
  - - ">="
59
71
  - !ruby/object:Gem::Version
60
- version: 0.5.1
72
+ version: 0.5.2
61
73
  - !ruby/object:Gem::Dependency
62
74
  name: avm-eac_ubuntu_base0
63
75
  requirement: !ruby/object:Gem::Requirement
@@ -98,34 +110,28 @@ dependencies:
98
110
  requirements:
99
111
  - - "~>"
100
112
  - !ruby/object:Gem::Version
101
- version: '0.117'
102
- - - ">="
103
- - !ruby/object:Gem::Version
104
- version: 0.117.1
113
+ version: '0.120'
105
114
  type: :runtime
106
115
  prerelease: false
107
116
  version_requirements: !ruby/object:Gem::Requirement
108
117
  requirements:
109
118
  - - "~>"
110
119
  - !ruby/object:Gem::Version
111
- version: '0.117'
112
- - - ">="
113
- - !ruby/object:Gem::Version
114
- version: 0.117.1
120
+ version: '0.120'
115
121
  - !ruby/object:Gem::Dependency
116
122
  name: eac_ruby_gem_support
117
123
  requirement: !ruby/object:Gem::Requirement
118
124
  requirements:
119
125
  - - "~>"
120
126
  - !ruby/object:Gem::Version
121
- version: '0.2'
127
+ version: '0.9'
122
128
  type: :development
123
129
  prerelease: false
124
130
  version_requirements: !ruby/object:Gem::Requirement
125
131
  requirements:
126
132
  - - "~>"
127
133
  - !ruby/object:Gem::Version
128
- version: '0.2'
134
+ version: '0.9'
129
135
  description:
130
136
  email:
131
137
  executables: []
@@ -146,6 +152,7 @@ files:
146
152
  - lib/avm/eac_webapp_base0/instances/apache_host.rb
147
153
  - lib/avm/eac_webapp_base0/instances/apache_path.rb
148
154
  - lib/avm/eac_webapp_base0/instances/base.rb
155
+ - lib/avm/eac_webapp_base0/instances/base/apache.rb
149
156
  - lib/avm/eac_webapp_base0/instances/base/install.rb
150
157
  - lib/avm/eac_webapp_base0/instances/deploy.rb
151
158
  - lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
@@ -177,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
177
184
  requirements:
178
185
  - - ">="
179
186
  - !ruby/object:Gem::Version
180
- version: '0'
187
+ version: '2.7'
181
188
  required_rubygems_version: !ruby/object:Gem::Requirement
182
189
  requirements:
183
190
  - - ">="