Merge pull request #78 from silinternational/develop

add memcache config to pw-manager
silinternational · May 10, 2019 · b0e6804 · b0e6804
2 parents 3fa3c64 + 42ae49d
commit b0e6804
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 1 deletion.
diff --git a/terraform/040-id-broker/README.md b/terraform/040-id-broker/README.md
@@ -116,6 +116,7 @@ This module is used to create an ECS service running id-broker.
  - `access_token_ssp` - Access token for simpleSAMLphp to use in API calls to id-broker
  - `access_token_idsync` - Access token for id-sync to use in API calls to id-broker
  - `help_center_url` - URL for general user help information
+ - `email_signature` - Text for use as the signature line of emails.
 
 ## Usage Example
 

diff --git a/terraform/050-pw-manager/README.md b/terraform/050-pw-manager/README.md
@@ -44,6 +44,8 @@ This module is used to create an ECS service running the password manager API an
  - `id_broker_validIpRanges` - List of valid IP blocks for ID Broker
  - `idp_name` - Short name of IdP for use in logs and email alerts
  - `logentries_set_id` - Logentries logset ID for creating new log in
+ - `memcache_config1_host` - First memcache server
+ - `memcache_config2_host` - Second memcache server
  - `memory` - Amount of memory to allocate to API container
  - `mysql_host` - Address for RDS instance
  - `mysql_pass` - MySQL password for id-broker
@@ -115,6 +117,8 @@ module "pwmanager" {
   idp_display_name                    = "${var.idp_display_name}"
   idp_name                            = "${var.idp_name}"
   logentries_set_id                   = "${data.terraform_remote_state.cluster.logentries_set_id}"
+  memcache_config1_host               = "${data.terraform_remote_state.elasticache.cache_nodes.0.address}"
+  memcache_config2_host               = "${data.terraform_remote_state.elasticache.cache_nodes.1.address}"
   memory                              = "${var.memory}"
   mysql_host                          = "${data.terraform_remote_state.database.rds_address}"
   mysql_pass                          = "${data.terraform_remote_state.database.db_pwmanager_pass}"

diff --git a/terraform/050-pw-manager/main-api.tf b/terraform/050-pw-manager/main-api.tf
@@ -89,6 +89,8 @@ data "template_file" "task_def" {
     idp_display_name                    = "${var.idp_display_name}"
     idp_name                            = "${var.idp_name}"
     logentries_key                      = "${logentries_log.log.token}"
+    memcache_config1_host               = "${var.memcache_config1_host}"
+    memcache_config2_host               = "${var.memcache_config2_host}"
     memory                              = "${var.memory}"
     mysql_host                          = "${var.mysql_host}"
     mysql_password                      = "${var.mysql_pass}"

diff --git a/terraform/050-pw-manager/task-definition-api.json b/terraform/050-pw-manager/task-definition-api.json
@@ -129,6 +129,14 @@
         "name": "LOGENTRIES_KEY",
         "value": "${logentries_key}"
       },
+      {
+        "name": "MEMCACHE_CONFIG1_host",
+        "value": "${memcache_config1_host}"
+      },
+      {
+        "name": "MEMCACHE_CONFIG2_host",
+        "value": "${memcache_config2_host}"
+      },
       {
         "name": "MYSQL_DATABASE",
         "value": "${db_name}"

diff --git a/terraform/050-pw-manager/vars.tf b/terraform/050-pw-manager/vars.tf
@@ -168,6 +168,14 @@ variable "logentries_set_id" {
   type = "string"
 }
 
+variable "memcache_config1_host" {
+  type = "string"
+}
+
+variable "memcache_config2_host" {
+  type = "string"
+}
+
 variable "memory" {
   description = "Amount of memory to allocate to container, recommend '128' for production"
   default     = "100"

diff --git a/terraform/060-simplesamlphp/vars.tf b/terraform/060-simplesamlphp/vars.tf
@@ -37,7 +37,7 @@ variable "cloudflare_domain" {
 
 variable "delete_remember_me_on_logout" {
   type    = "string"
-  default = "true"
+  default = "false"
 }
 
 variable "docker_image" {