avm-eac_redmine_base0 0.15.0 → 0.16.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/avm/eac_redmine_base0/instances/apache_host.rb +2 -2
- data/lib/avm/eac_redmine_base0/instances/base/database.rb +30 -0
- data/lib/avm/eac_redmine_base0/instances/base/gitolite.rb +42 -0
- data/lib/avm/eac_redmine_base0/instances/base/web.rb +20 -0
- data/lib/avm/eac_redmine_base0/instances/base.rb +1 -0
- data/lib/avm/eac_redmine_base0/instances/deploy.rb +2 -2
- data/lib/avm/eac_redmine_base0/instances/docker_image.rb +2 -6
- data/lib/avm/eac_redmine_base0/version.rb +1 -1
- data/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template +11 -3
- metadata +9 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 30d851b9a2e5895bffd9830f752d05e18957b897e44398026c61916ecc3955b7
|
4
|
+
data.tar.gz: b744ea2ec75dc9f349475c66a94a5611a38d208b4c53b8116e3029d87aba2858
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fdeb8c77b40dacf07dfaf1f738eed19e1f255f562030f487aecce8bc25b765b8e49a95d773a25bb5518e9b3a715e3fbf5698770e17b360e3b711d1934aa47cd3
|
7
|
+
data.tar.gz: 0ba34fcbe7f3ceee0b31c8025ef4168ccd7b4d985aed23089a4c547b7cba1ee32ec3199ffb6595546ee0a02a7ce162ae0fa10228d916be6048cd05fd5f2cf034
|
@@ -1,11 +1,11 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'avm/eac_rails_base1/apache_host'
|
3
|
+
require 'avm/eac_rails_base1/instances/apache_host'
|
4
4
|
|
5
5
|
module Avm
|
6
6
|
module EacRedmineBase0
|
7
7
|
module Instances
|
8
|
-
class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
|
8
|
+
class ApacheHost < ::Avm::EacRailsBase1::Instances::ApacheHost
|
9
9
|
end
|
10
10
|
end
|
11
11
|
end
|
@@ -0,0 +1,30 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/eac_rails_base1/instances/base'
|
4
|
+
require 'eac_ruby_utils/core_ext'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module EacRedmineBase0
|
8
|
+
module Instances
|
9
|
+
class Base < ::Avm::EacRailsBase1::Instances::Base
|
10
|
+
module Database
|
11
|
+
DATABASE_INTERNAL_HOSTNAME = 'localhost'
|
12
|
+
DEFAULT_POSTGRESQL_VERSION = '12'
|
13
|
+
|
14
|
+
common_concern do
|
15
|
+
uri_components_entries_values 'postgresql', %w[version]
|
16
|
+
end
|
17
|
+
|
18
|
+
def database_internal
|
19
|
+
entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value ==
|
20
|
+
DATABASE_INTERNAL_HOSTNAME
|
21
|
+
end
|
22
|
+
|
23
|
+
def postgresql_version_default_value
|
24
|
+
DEFAULT_POSTGRESQL_VERSION
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
@@ -0,0 +1,42 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/eac_rails_base1/instances/base'
|
4
|
+
require 'eac_ruby_utils/core_ext'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module EacRedmineBase0
|
8
|
+
module Instances
|
9
|
+
class Base < ::Avm::EacRailsBase1::Instances::Base
|
10
|
+
module Gitolite
|
11
|
+
GITOLITE_ENTRY_KEYS_PREFIX = 'gitolite'
|
12
|
+
DEFAULT_HOSTNAME = 'localhost'
|
13
|
+
DEFAULT_PATH_PARENT = '/var/lib'
|
14
|
+
DEFAULT_SCHEME = 'file'
|
15
|
+
DEFAULT_USERNAME = 'git'
|
16
|
+
|
17
|
+
common_concern do
|
18
|
+
uri_components_entries_values GITOLITE_ENTRY_KEYS_PREFIX
|
19
|
+
end
|
20
|
+
|
21
|
+
def gitolite_hostname_default_value
|
22
|
+
DEFAULT_HOSTNAME
|
23
|
+
end
|
24
|
+
|
25
|
+
def gitolite_path_default_value
|
26
|
+
read_entry_optional([GITOLITE_ENTRY_KEYS_PREFIX, 'username']).if_present do |v|
|
27
|
+
::File.join(DEFAULT_PATH_PARENT, v)
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
def gitolite_scheme_default_value
|
32
|
+
DEFAULT_SCHEME
|
33
|
+
end
|
34
|
+
|
35
|
+
def gitolite_username_default_value
|
36
|
+
DEFAULT_USERNAME
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
@@ -0,0 +1,20 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'avm/eac_rails_base1/instances/base'
|
4
|
+
require 'eac_ruby_utils/core_ext'
|
5
|
+
|
6
|
+
module Avm
|
7
|
+
module EacRedmineBase0
|
8
|
+
module Instances
|
9
|
+
class Base < ::Avm::EacRailsBase1::Instances::Base
|
10
|
+
module Web
|
11
|
+
def web_authority
|
12
|
+
web_hostname.if_present do |h|
|
13
|
+
h.to_s + web_port_optional.if_present('') { |p| ":#{p}" }
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'avm/eac_webapp_base0/deploy'
|
3
|
+
require 'avm/eac_webapp_base0/instances/deploy'
|
4
4
|
require 'eac_ruby_utils/ruby'
|
5
5
|
|
6
6
|
module Avm
|
7
7
|
module EacRedmineBase0
|
8
8
|
module Instances
|
9
|
-
class Deploy < ::Avm::EacWebappBase0::Deploy
|
9
|
+
class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
|
10
10
|
set_callback :assert_instance_branch, :after, :run_installer
|
11
11
|
|
12
12
|
def run_installer
|
@@ -14,9 +14,10 @@ module Avm
|
|
14
14
|
BASE_IMAGE = 'ubuntu:20.04'
|
15
15
|
INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
|
16
16
|
INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
|
17
|
-
DATABASE_INTERNAL_HOSTNAME = 'localhost'
|
18
17
|
REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
|
19
18
|
|
19
|
+
delegate :database_internal, to: :instance
|
20
|
+
|
20
21
|
def avm_fs_cache_object_id
|
21
22
|
instance.id
|
22
23
|
end
|
@@ -31,11 +32,6 @@ module Avm
|
|
31
32
|
eac_ubuntu_base0_instance.docker_image.provide.id
|
32
33
|
end
|
33
34
|
|
34
|
-
def database_internal
|
35
|
-
instance.entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value ==
|
36
|
-
DATABASE_INTERNAL_HOSTNAME
|
37
|
-
end
|
38
|
-
|
39
35
|
def installer_target_task
|
40
36
|
if web_path_present?
|
41
37
|
INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT
|
@@ -1,10 +1,17 @@
|
|
1
|
+
# Ruby
|
2
|
+
export rvm_ruby='ruby-%%RUBY.VERSION%%'
|
3
|
+
|
4
|
+
# Database
|
5
|
+
export postgresql_internal='%%DATABASE_INTERNAL%%'
|
6
|
+
export postgresql_host='%%DATABASE.HOSTNAME%%'
|
7
|
+
export postgresql_port='%%DATABASE.PORT%%'
|
1
8
|
export postgresql_database='%%DATABASE.NAME%%'
|
2
|
-
export postgresql_database_test='%%DATABASE.NAME%%_test'
|
3
9
|
export postgresql_user='%%DATABASE.USERNAME%%'
|
4
10
|
export postgresql_password='%%DATABASE.PASSWORD%%'
|
5
11
|
export postgresql_version='%%POSTGRESQL.VERSION%%'
|
6
|
-
export
|
7
|
-
|
12
|
+
export postgresql_extra_settings='%%DATABASE.EXTRA%%'
|
13
|
+
|
14
|
+
# Web
|
8
15
|
if [ '%%WEB.SCHEME%%' == 'https' ]; then
|
9
16
|
export address_https='true'
|
10
17
|
else
|
@@ -17,6 +24,7 @@ export address_path='%%WEB.PATH%%'
|
|
17
24
|
export git_repositories_hierarchical_organisation=false
|
18
25
|
export gitolite_user='%%GIT.USERNAME%%'
|
19
26
|
export gitolite_user_home="/var/lib/${gitolite_user}"
|
27
|
+
export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
|
20
28
|
|
21
29
|
# Mail settings
|
22
30
|
export smtp_server='%%MAILER.SMTP.ADDRESS%%'
|
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.
|
4
|
+
version: 0.16.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-
|
11
|
+
date: 2022-09-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: avm
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '0.
|
19
|
+
version: '0.44'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '0.
|
26
|
+
version: '0.44'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: avm-eac_generic_base0
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -132,14 +132,14 @@ dependencies:
|
|
132
132
|
requirements:
|
133
133
|
- - "~>"
|
134
134
|
- !ruby/object:Gem::Version
|
135
|
-
version: '0.
|
135
|
+
version: '0.104'
|
136
136
|
type: :runtime
|
137
137
|
prerelease: false
|
138
138
|
version_requirements: !ruby/object:Gem::Requirement
|
139
139
|
requirements:
|
140
140
|
- - "~>"
|
141
141
|
- !ruby/object:Gem::Version
|
142
|
-
version: '0.
|
142
|
+
version: '0.104'
|
143
143
|
- !ruby/object:Gem::Dependency
|
144
144
|
name: eac_ruby_gem_support
|
145
145
|
requirement: !ruby/object:Gem::Requirement
|
@@ -164,6 +164,9 @@ files:
|
|
164
164
|
- lib/avm/eac_redmine_base0/instances.rb
|
165
165
|
- lib/avm/eac_redmine_base0/instances/apache_host.rb
|
166
166
|
- lib/avm/eac_redmine_base0/instances/base.rb
|
167
|
+
- lib/avm/eac_redmine_base0/instances/base/database.rb
|
168
|
+
- lib/avm/eac_redmine_base0/instances/base/gitolite.rb
|
169
|
+
- lib/avm/eac_redmine_base0/instances/base/web.rb
|
167
170
|
- lib/avm/eac_redmine_base0/instances/data_unit.rb
|
168
171
|
- lib/avm/eac_redmine_base0/instances/deploy.rb
|
169
172
|
- lib/avm/eac_redmine_base0/instances/docker_image.rb
|