Skip to content

Commit

Permalink
Merge pull request #2 from silinternational/develop
Browse files Browse the repository at this point in the history 
Initial release
  • Loading branch information
@fillup
fillup authored May 8, 2020
2 parents 5c789cf + 42f6049 commit 9909d97
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 40 deletions.
92 changes: 58 additions & 34 deletions main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@ module "ecr" {
}

/*
* Create Logentries log
* Create Cloudwatch log group
*/
resource "logentries_log" "log" {
logset_id = "${data.terraform_remote_state.common.logentries_set_id}"
name = "${var.app_name}"
source = "token"
resource "aws_cloudwatch_log_group" "logs" {
name = "${var.app_name}-${data.terraform_remote_state.common.app_env}"
retention_in_days = 30

tags {
idp_name = "${var.idp_name}"
app_env = "${data.terraform_remote_state.common.app_env}"
}
}

/*
Expand Down Expand Up @@ -70,17 +74,31 @@ module "ecs-service-cloudwatch-dashboard" {
}

/*
* Create Memcache cluster for session handling
* Create Elasticache subnet group
*/
module "memcache" {
source = "github.com/silinternational/terraform-modules//aws/elasticache/memcache?ref=2.2.0"
cluster_id = "${var.app_name}-${data.terraform_remote_state.common.app_env}"
security_group_ids = ["${data.terraform_remote_state.common.vpc_default_sg_id}"]
subnet_group_name = "${var.app_name}-${data.terraform_remote_state.common.app_env}"
subnet_ids = ["${data.terraform_remote_state.common.private_subnet_ids}"]
availability_zones = ["${data.terraform_remote_state.common.aws_zones}"]
app_name = "${var.app_name}"
app_env = "${data.terraform_remote_state.common.app_env}"
resource "aws_elasticache_subnet_group" "memcache_subnet_group" {
name = "${var.app_name}-${data.terraform_remote_state.common.app_env}"
subnet_ids = ["${data.terraform_remote_state.common.private_subnet_ids}"]
}

/*
* Create Cluster
*/
resource "aws_elasticache_cluster" "memcache" {
cluster_id = "${var.app_name}-${data.terraform_remote_state.common.app_env}"
engine = "memcached"
node_type = "${var.memcache_node_type}"
port = "${var.memcache_port}"
num_cache_nodes = "${var.memcache_num_cache_nodes}"
parameter_group_name = "${var.memcache_parameter_group_name}"
security_group_ids = ["${data.terraform_remote_state.common.vpc_default_sg_id}"]
subnet_group_name = "${aws_elasticache_subnet_group.memcache_subnet_group.name}"
az_mode = "${var.memcache_az_mode}"

tags {
"app_name" = "${var.app_name}"
"app_env" = "${data.terraform_remote_state.common.app_env}"
}
}

/*
Expand All @@ -97,26 +115,31 @@ resource "random_id" "ssp_secret_salt" {
/*
* Create task definition template
*/
data "template_file" "task_def_web" {
template = "${file("${path.module}/task-def-web.json")}"
data "template_file" "task_def_hub" {
template = "${file("${path.module}/task-def-hub.json")}"

vars {
admin_email = "${var.admin_email}"
admin_name = "${var.admin_name}"
admin_pass = "${random_id.ssp_admin_pass.hex}"
cloudflare_domain = "${var.cloudflare_domain}"
cpu = "${var.cpu}"
docker_image = "${module.ecr.repo_url}"
docker_tag = "${var.docker_tag}"
idp_display_name = "${var.idp_display_name}"
idp_name = "${var.idp_name}"
logentries_key = "${logentries_log.log.token}"
memcache_host1 = "${module.memcache.cache_nodes.0.address}"
memcache_host2 = "${module.memcache.cache_nodes.1.address}"
memory = "${var.memory}"
secret_salt = "${random_id.ssp_secret_salt.hex}"
show_saml_errors = "${var.show_saml_errors}"
subdomain = "${var.subdomain}"
admin_email = "${var.admin_email}"
admin_name = "${var.admin_name}"
admin_pass = "${random_id.ssp_admin_pass.hex}"
analytics_id = "${var.analytics_id}"
app_env = "${data.terraform_remote_state.common.app_env}"
app_name = "${var.app_name}"
aws_region = "${var.aws_region}"
cloudwatch_log_group_name = "${aws_cloudwatch_log_group.logs.name}"
cloudflare_domain = "${var.cloudflare_domain}"
cpu = "${var.cpu}"
docker_image = "${module.ecr.repo_url}"
docker_tag = "${var.docker_tag}"
idp_display_name = "${var.idp_display_name}"
idp_name = "${var.idp_name}"
memcache_host1 = "${aws_elasticache_cluster.memcache.cache_nodes.0.address}"
memcache_host2 = "${aws_elasticache_cluster.memcache.cache_nodes.1.address}"
memory = "${var.memory}"
secret_salt = "${random_id.ssp_secret_salt.hex}"
session_store_type = "${var.session_store_type}"
show_saml_errors = "${var.show_saml_errors}"
subdomain = "${var.subdomain}"
}
}

Expand All @@ -128,7 +151,7 @@ module "ecs" {
cluster_id = "${data.terraform_remote_state.common.ecs_cluster_id}"
service_name = "${var.app_name}"
service_env = "${data.terraform_remote_state.common.app_env}"
container_def_json = "${data.template_file.task_def_web.rendered}"
container_def_json = "${data.template_file.task_def_hub.rendered}"
desired_count = "${var.desired_count}"
tg_arn = "${aws_alb_target_group.tg.arn}"
lb_container_name = "hub"
Expand All @@ -140,6 +163,7 @@ module "ecs" {
* Create Cloudflare DNS record
*/
resource "cloudflare_record" "dns" {
count = "${var.create_dns_entry}"
domain = "${var.cloudflare_domain}"
name = "${var.subdomain}"
value = "${data.terraform_remote_state.common.alb_dns_name}"
Expand Down
1 change: 1 addition & 0 deletions providers.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ provider "aws" {
}

provider "cloudflare" {
version = "~> 1.0"
email = "${var.cloudflare_email}"
token = "${var.cloudflare_token}"
}
Expand Down
15 changes: 9 additions & 6 deletions task-def-hub.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
[
{
"dnsSearchDomains": null,
"logConfiguration": null,
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "${cloudwatch_log_group_name}",
"awslogs-region": "${aws_region}",
"awslogs-stream-prefix": "${app_name}-${app_env}"
}
},
"entryPoint": null,
"portMappings": [
{
Expand Down Expand Up @@ -50,10 +57,6 @@
"name": "IDP_NAME",
"value": "${idp_name}"
},
{
"name": "LOGENTRIES_KEY",
"value": "${logentries_key}"
},
{
"name": "MEMCACHE_HOST1",
"value": "${memcache_host1}"
Expand Down Expand Up @@ -100,4 +103,4 @@
"privileged": null,
"name": "hub"
}
]
]
29 changes: 29 additions & 0 deletions vars.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ variable "cpu" {
default = "128"
}

variable "create_dns_entry" {
description = "Set to 1 to create Cloudflare entry, 0 to not create entry"
default = 1
}

variable "desired_count" {
default = 2
}
Expand All @@ -40,6 +45,30 @@ variable "idp_display_name" {}
variable "idp_name" {}
variable "logentries_account_key" {}

variable "memcache_az_mode" {
type = "string"
default = "cross-az"
}

variable "memcache_node_type" {
default = "cache.t2.micro"
}

variable "memcache_num_cache_nodes" {
type = "string"
default = 2
}

variable "memcache_parameter_group_name" {
type = "string"
default = "default.memcached1.5"
}

variable "memcache_port" {
type = "string"
default = "11211"
}

variable "memory" {
default = "128"
}
Expand Down

0 comments on commit 9909d97

Please sign in to comment.