summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgor Yurtaev <yurtaev.egor@gmail.com>2015-08-21 13:56:05 +0600
committerEgor Yurtaev <yurtaev.egor@gmail.com>2015-08-21 13:56:05 +0600
commita236a6df8a4adca940f0092d95f3b7fd9eebc397 (patch)
tree15acd3d57d354d0cfbd44abcf1c326f374f54951
parent0e6430435f9efa0592ed8168dae1aeaacd6b5283 (diff)
downloadomaha-server-a236a6df8a4adca940f0092d95f3b7fd9eebc397.zip
omaha-server-a236a6df8a4adca940f0092d95f3b7fd9eebc397.tar.gz
omaha-server-a236a6df8a4adca940f0092d95f3b7fd9eebc397.tar.bz2
update deploy template/example
-rw-r--r--deploy/ebs.config.template2
-rw-r--r--deploy/settings.yml.example15
2 files changed, 15 insertions, 2 deletions
diff --git a/deploy/ebs.config.template b/deploy/ebs.config.template
index 9e062b7..7e4f6f6 100644
--- a/deploy/ebs.config.template
+++ b/deploy/ebs.config.template
@@ -98,7 +98,7 @@ app:
'{{ key }}':
{% for k, v in value.iteritems() -%}
'{{ k }}': {{ v }}
- {% endfor -%}
+ {% endfor %}
{% endfor -%}
{% endif -%}
{% endfor %}
diff --git a/deploy/settings.yml.example b/deploy/settings.yml.example
index 433b820..fd86336 100644
--- a/deploy/settings.yml.example
+++ b/deploy/settings.yml.example
@@ -10,12 +10,25 @@ app:
key_name: omaha_server
+ solution_stack_name: '64bit Amazon Linux 2015.03 v1.4.3 running Docker 1.6.2' # optional default: '64bit Amazon Linux 2015.03 v1.4.3 running Docker 1.6.2'
+ InstanceType: t2.large # optional default: t2.small http://aws.amazon.com/ec2/instance-types/
+ autoscaling: # optional default: min=1 max=10
+ min: 4
+ max: 20
+ healthcheck_url: '/admin/' # optional default: '/healthcheck/status/'
+
environments:
omaha-server-private:
- option_settings:
+ option_settings: # Configuration Options http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html
'aws:autoscaling:launchconfiguration':
IamInstanceProfile: omaha-public
SecurityGroups: omaha-server,omaha-server-private
+
+ 'aws:ec2:vpc':
+ VPCId: vpc-bb6b9fdf
+ Subnets: subnet-e386d5ba
+ AssociatePublicIpAddress: 'true'
+
environment:
OMAHA_SERVER_PRIVATE: true
SECRET_KEY: **********