elastic_beans 0.10.0.alpha11 → 0.10.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.
- checksums.yaml +4 -4
- data/lib/elastic_beans/cli.rb +0 -2
- data/lib/elastic_beans/command/configure.rb +0 -4
- data/lib/elastic_beans/command/kill.rb +1 -1
- data/lib/elastic_beans/configuration_template/webserver.rb +2 -8
- data/lib/elastic_beans/configuration_template.rb +1 -1
- data/lib/elastic_beans/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fb7f9c88b1b93573e6bc9a4b144e6c1fd845104c
|
4
|
+
data.tar.gz: fae86945834ce9e7ddeacfa47787790070464b89
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1dc19193cb3c26d5e0b721441b49c8b6206348da5c70739dfd5356eb0c57f15efb1a443f366d82fec352227be50c27e29e5f766170582711f5ae4c0aff235093
|
7
|
+
data.tar.gz: 71e894e9d783f8ded910690ab2db350f50130c020e3524e1c2c5d555d80c2fb999c1d728bf789ead81a5f2f976fae385989b4f02bedd6fcd6472d5de48ab277b
|
data/lib/elastic_beans/cli.rb
CHANGED
@@ -19,7 +19,6 @@ class ElasticBeans::CLI < Thor
|
|
19
19
|
option :database_url, aliases: %w(-d), desc: "The DATABASE_URL for the Rails application"
|
20
20
|
option :image_id, aliases: %w(-i), desc: "A custom AMI to use instead of the default Ruby Elastic Beanstalk AMI"
|
21
21
|
option :instance_type, aliases: %w(-t), desc: "A default instance type to use for all environments instead of c4.large"
|
22
|
-
option :internal, type: :boolean, desc: "Configure the webserver to only be available for internal VPC access"
|
23
22
|
option :keypair, aliases: %w(-k), desc: "Required on first run. The EC2 keypair to use for Elastic Beanstalk instances"
|
24
23
|
option :public_key, aliases: %w(-p), desc: "For end-to-end encryption. The public key of the SSL certificate the ELB will verify to communicate with your Rails app"
|
25
24
|
option :secret_key_base, aliases: %w(-b), desc: "The SECRET_KEY_BASE for the Rails application"
|
@@ -30,7 +29,6 @@ class ElasticBeans::CLI < Thor
|
|
30
29
|
database_url: options[:database_url],
|
31
30
|
image_id: options[:image_id],
|
32
31
|
instance_type: options[:instance_type],
|
33
|
-
internal: options[:internal],
|
34
32
|
keypair: options[:keypair],
|
35
33
|
public_key: options[:public_key],
|
36
34
|
secret_key_base: options[:secret_key_base],
|
@@ -19,7 +19,6 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
|
|
19
19
|
database_url:,
|
20
20
|
image_id:,
|
21
21
|
instance_type:,
|
22
|
-
internal:,
|
23
22
|
keypair:,
|
24
23
|
public_key:,
|
25
24
|
secret_key_base:,
|
@@ -33,7 +32,6 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
|
|
33
32
|
@database_url = database_url
|
34
33
|
@image_id = image_id
|
35
34
|
@instance_type = instance_type
|
36
|
-
@internal = internal
|
37
35
|
@keypair = keypair
|
38
36
|
@public_key = public_key
|
39
37
|
@secret_key_base = secret_key_base
|
@@ -84,7 +82,6 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
|
|
84
82
|
secret_key_base: secret_key_base,
|
85
83
|
image_id: image_id,
|
86
84
|
instance_type: instance_type,
|
87
|
-
internal: internal,
|
88
85
|
keypair: keypair,
|
89
86
|
iam: iam,
|
90
87
|
public_key: public_key,
|
@@ -181,7 +178,6 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
|
|
181
178
|
:database_url,
|
182
179
|
:image_id,
|
183
180
|
:instance_type,
|
184
|
-
:internal,
|
185
181
|
:keypair,
|
186
182
|
:network,
|
187
183
|
:public_key,
|
@@ -27,7 +27,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
|
|
27
27
|
def run(command_id)
|
28
28
|
ui.info("Scheduling command '#{command_id}' on #{application.name} for termination...")
|
29
29
|
application.kill_command(command_id)
|
30
|
-
ui.info("It may be a few moments before the command terminates.")
|
30
|
+
ui.info("It may be a few moments before the command terminates. If this is an interactive command, it will not be terminated.")
|
31
31
|
end
|
32
32
|
|
33
33
|
private
|
@@ -13,7 +13,7 @@ module ElasticBeans
|
|
13
13
|
|
14
14
|
# Constructs the configuration for the webserver environment.
|
15
15
|
# All arguments are required on first run.
|
16
|
-
def build_option_settings(network: nil, public_key: nil, ssl_certificate_arn: nil,
|
16
|
+
def build_option_settings(network: nil, public_key: nil, ssl_certificate_arn: nil, **_)
|
17
17
|
public_key_policy_names_setting = template_option_setting(namespace: "aws:elb:policies:backendencryption", option_name: "PublicKeyPolicyNames", default: "backendkey")
|
18
18
|
public_key_setting = template_option_setting(namespace: "aws:elb:policies:#{public_key_policy_names_setting[:value]}", option_name: "PublicKey", override: public_key)
|
19
19
|
ssl_certificate_setting = template_option_setting(namespace: "aws:elb:listener:443", option_name: "SSLCertificateId", override: ssl_certificate_arn)
|
@@ -21,7 +21,7 @@ module ElasticBeans
|
|
21
21
|
raise NoEncryptionSettingsError
|
22
22
|
end
|
23
23
|
|
24
|
-
|
24
|
+
super + [
|
25
25
|
template_option_setting(namespace: "aws:elasticbeanstalk:application", option_name: "Application Healthcheck URL", default: "HTTPS:443/", allow_blank: false),
|
26
26
|
template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_ASSET_COMPILATION", default: "false"),
|
27
27
|
template_option_setting(namespace: "aws:elasticbeanstalk:application:environment", option_name: "RAILS_SKIP_MIGRATIONS", default: "false"),
|
@@ -36,12 +36,6 @@ module ElasticBeans
|
|
36
36
|
public_key_setting,
|
37
37
|
ssl_certificate_setting,
|
38
38
|
]
|
39
|
-
if internal
|
40
|
-
internal_setting = template_option_setting(namespace: "aws:ec2:vpc", option_name: "ELBScheme", override: "internal")
|
41
|
-
option_settings << internal_setting
|
42
|
-
end
|
43
|
-
|
44
|
-
super + option_settings
|
45
39
|
end
|
46
40
|
|
47
41
|
def elb_security_groups(network)
|
@@ -11,7 +11,7 @@ module ElasticBeans
|
|
11
11
|
# namespace) directly.
|
12
12
|
class ConfigurationTemplate
|
13
13
|
# The solution stack used for a new application. Should not be hardcoded, but here we are.
|
14
|
-
SOLUTION_STACK_NAME = "64bit Amazon Linux 2016.09 v2.
|
14
|
+
SOLUTION_STACK_NAME = "64bit Amazon Linux 2016.09 v2.2.0 running Ruby 2.3 (Puma)"
|
15
15
|
# :category: Internal
|
16
16
|
WORKER_TEMPLATE_NAME_PATTERN = /\Aworker-(?<queue>\w+)\z/
|
17
17
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: elastic_beans
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.10.0
|
4
|
+
version: 0.10.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adam Stegman
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-05-
|
11
|
+
date: 2017-05-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk
|
@@ -250,9 +250,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
250
250
|
version: '0'
|
251
251
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
252
252
|
requirements:
|
253
|
-
- - "
|
253
|
+
- - ">="
|
254
254
|
- !ruby/object:Gem::Version
|
255
|
-
version:
|
255
|
+
version: '0'
|
256
256
|
requirements: []
|
257
257
|
rubyforge_project:
|
258
258
|
rubygems_version: 2.6.11
|