avm-eac_webapp_base0 0.7.0 → 0.8.0

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/eac_webapp_base0/apache_host.rb +6 -1
  3. data/lib/avm/eac_webapp_base0/version.rb +1 -1
  4. data/template/avm/eac_webapp_base0/apache_host/no_ssl.conf +1 -1
  5. metadata +6 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d19706588763ddfb9486347626c14084ed45f6fef3456da2ba0a4c5f89075aed
4
- data.tar.gz: 53a8ba40b77d924ed300e26c0d4436e90c565cd0882534a64e5b260c4a3e8e82
3
+ metadata.gz: c54900f40cbb246d07176ed3e482e002249df9a1f4253107d51c148bc8043c4e
4
+ data.tar.gz: 35faefcc23749106207ec0e41a7cc032beea459f81bc152ea441481bb35762bc
5
5
  SHA512:
6
- metadata.gz: 2319d3ebf243fee42efe908daa895920e0c23cc9a0d2f1eb965a5e79581c6e1d860ff6a22acf907b847a48d648e32bc140890d44c99af53879b9fc5c543d40e7
7
- data.tar.gz: f25dff84a1a0e9a6bb783201332465dc0a6e2830fbf578bd35c96e33d26d699ba77fa915489c39be7e42823d30c89e224a4b4f89c3dcc3f8b850a862343a17c5
6
+ metadata.gz: b2a120a192f25621e2111037d53683635cee565f5fd9f4805d7b4ea1056d6e884421b82d6842df05b8644f76302b5a34598cd5647220e5e24e0c6f7329f2ea47
7
+ data.tar.gz: 53add19e7a64aca1b4c244d9b6e4a1bc2b36918ae9364dfcd116b7aa914bc6fe173d1ccb304701cd212e767511bc4abc9dda4679b4074f105a66420e9f63b749
data/lib/avm/eac_webapp_base0/apache_host.rb CHANGED
@@ -8,10 +8,15 @@ require 'eac_templates/core_ext'
8
8
  module Avm
9
9
  module EacWebappBase0
10
10
  class ApacheHost
11
+ APACHE_DIRECTORY_EXTRA_CONFIG_KEY = 'install.apache_directory_extra_config'
11
12
  JOBS = %w[write_available_no_ssl_site enable_no_ssl_site remove_ssl_site reload_apache
12
13
  run_certbot enable_ssl_site reload_apache].freeze
13
14
  include ::Avm::Jobs::Base
14
15
 
16
+ def directory_extra_config
17
+ instance.entry(APACHE_DIRECTORY_EXTRA_CONFIG_KEY).value.if_present { |v| " #{v}\n" }
18
+ end
19
+
15
20
  def no_ssl_site_content
16
21
  ::Avm::EacWebappBase0::ApacheHost
17
22
  .template.child('no_ssl.conf')
@@ -61,7 +66,7 @@ module Avm
61
66
  instance.host_env.command(
62
67
  'sudo', 'certbot', '--apache', '--domain', instance.read_entry('web.hostname'),
63
68
  '--redirect', '--non-interactive', '--agree-tos',
64
- '--email', instance.read_entry('admin.email')
69
+ '--email', instance.install_email
65
70
  ).system!
66
71
  end
67
72
 
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.7.0'
5
+ VERSION = '0.8.0'
6
6
  end
7
7
  end
data/template/avm/eac_webapp_base0/apache_host/no_ssl.conf CHANGED
@@ -7,5 +7,5 @@
7
7
  Allow from all
8
8
  Options -MultiViews
9
9
  Require all granted
10
- </Directory>
10
+ %%DIRECTORY_EXTRA_CONFIG%% </Directory>
11
11
  </VirtualHost>
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.7.0
4
+ version: 0.8.0
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: 2022-09-08 00:00:00.000000000 Z
11
+ date: 2022-09-14 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.41'
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 0.41.1
19
+ version: '0.42'
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.41'
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: 0.41.1
26
+ version: '0.42'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: avm-eac_generic_base0
35
29
  requirement: !ruby/object:Gem::Requirement
@@ -78,20 +72,14 @@ dependencies:
78
72
  requirements:
79
73
  - - "~>"
80
74
  - !ruby/object:Gem::Version
81
- version: '0.102'
82
- - - ">="
83
- - !ruby/object:Gem::Version
84
- version: 0.102.1
75
+ version: '0.103'
85
76
  type: :runtime
86
77
  prerelease: false
87
78
  version_requirements: !ruby/object:Gem::Requirement
88
79
  requirements:
89
80
  - - "~>"
90
81
  - !ruby/object:Gem::Version
91
- version: '0.102'
92
- - - ">="
93
- - !ruby/object:Gem::Version
94
- version: 0.102.1
82
+ version: '0.103'
95
83
  - !ruby/object:Gem::Dependency
96
84
  name: eac_ruby_gem_support
97
85
  requirement: !ruby/object:Gem::Requirement