et_full_system 1.0.0.pre25 → 1.0.0.pre29
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/foreman/et1.env +1 -2
- data/lib/et_full_system/cli/docker.rb +13 -2
- data/lib/et_full_system/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dbee5bddfbf87aeef64f1d29860f6459207605633545d65d4354a0964be6840f
|
|
4
|
+
data.tar.gz: 997b39a8c280121f03e6e5e3ea856e73db0124477782e34811a89149a19be51f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: caee6a149972b213d37a08af23352f9488a6875524433ae179cbcca6459570684ab2fe726f04eaab26b8c4b67c783b0c639e93ffa03bdd353c3ce04469d54dba
|
|
7
|
+
data.tar.gz: 0c0d1b3773b3b9ec56e9344671324442c5c1567a6875377e63bc91864322911b438a4e8d393dbf9b148abb8949b4fd2f9714fe5a694eef9f440e3b79ebf37195
|
data/Gemfile.lock
CHANGED
data/foreman/et1.env
CHANGED
|
@@ -88,6 +88,7 @@ module EtFullSystem
|
|
|
88
88
|
result = `#{compose_cmd}`
|
|
89
89
|
replace_db_host_port(result)
|
|
90
90
|
replace_redis_host_port(result)
|
|
91
|
+
replace_smtp_host_port(result)
|
|
91
92
|
puts result
|
|
92
93
|
end
|
|
93
94
|
end
|
|
@@ -131,14 +132,24 @@ module EtFullSystem
|
|
|
131
132
|
env.gsub!(/^REDIS_PORT=.*$/, "REDIS_PORT=#{redis_port}")
|
|
132
133
|
end
|
|
133
134
|
|
|
135
|
+
def replace_smtp_host_port(env)
|
|
136
|
+
env.gsub!(/^SMTP_HOSTNAME=.*$/, 'SMTP_HOSTNAME=localhost')
|
|
137
|
+
env.gsub!(/^SMTP_PORT=.*$/, "SMTP_PORT=#{smtp_port}")
|
|
138
|
+
end
|
|
139
|
+
|
|
134
140
|
def db_port
|
|
135
141
|
result = run_compose_command :port, :db, 5432
|
|
136
|
-
result.split(':').last
|
|
142
|
+
result.split(':').last.strip
|
|
137
143
|
end
|
|
138
144
|
|
|
139
145
|
def redis_port
|
|
140
146
|
result = run_compose_command :port, :redis, 6379
|
|
141
|
-
result.split(':').last
|
|
147
|
+
result.split(':').last.strip
|
|
148
|
+
end
|
|
149
|
+
|
|
150
|
+
def smtp_port
|
|
151
|
+
result = run_compose_command :port, :et, 1025
|
|
152
|
+
result.split(':').last.strip
|
|
142
153
|
end
|
|
143
154
|
end
|
|
144
155
|
end
|