Merge pull request #26 from silinternational/develop

Add change pw url for SSP
silinternational · Aug 30, 2017 · 3b5bb8c · 3b5bb8c
2 parents 9c6519e + a574934
commit 3b5bb8c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/terraform/060-simplesamlphp/README.md b/terraform/060-simplesamlphp/README.md
@@ -17,7 +17,8 @@ This module is used to create an ECS service running simpleSAMLphp.
  - `subdomain` - Subdomain for SSP IdP
  - `cloudflare_domain` - Top level domain name for use with Cloudflare
  - `docker_image` - URL to Docker image
- - `forgot_password_url` - URL to forgot password page
+ - `password_change_url` - URL to change password page
+ - `password_forgot_url` - URL to forgot password page
  - `hub_mode` - Whether or not this IdP is in hub mode, default: false
  - `id_broker_access_token` - Access token for calling id-broker
  - `id_broker_base_uri` - Base URL to id-broker API
@@ -63,7 +64,8 @@ module "ssp" {
   subdomain              = "${var.ssp_subdomain}"
   cloudflare_domain      = "${var.cloudflare_domain}"
   docker_image           = "${data.terraform_remote_state.ecr.ecr_repo_simplesamlphp}"
-  forgot_password_url    = "https://${data.terraform_remote_state.pwmanager.ui_hostname}/#/forgot"
+  password_change_url    = "https://${data.terraform_remote_state.pwmanager.ui_hostname}/#/change"
+  password_forgot_url    = "https://${data.terraform_remote_state.pwmanager.ui_hostname}/#/forgot"
   hub_mode               = "${var.hub_mode}"
   id_broker_access_token = "${data.terraform_remote_state.broker.access_token_ssp}"
   id_broker_base_uri     = "https://${data.terraform_remote_state.broker.hostname}"

diff --git a/terraform/060-simplesamlphp/main.tf b/terraform/060-simplesamlphp/main.tf
@@ -61,7 +61,8 @@ data "template_file" "task_def" {
     admin_pass             = "${random_id.admin_pass.hex}"
     base_url               = "https://${var.subdomain}.${var.cloudflare_domain}/"
     docker_image           = "${var.docker_image}"
-    forgot_password_url    = "${var.forgot_password_url}"
+    password_change_url    = "${var.password_change_url}"
+    password_forgot_url    = "${var.password_forgot_url}"
     hub_mode               = "${var.hub_mode}"
     id_broker_access_token = "${var.id_broker_access_token}"
     id_broker_base_uri     = "${var.id_broker_base_uri}"

diff --git a/terraform/060-simplesamlphp/task-definition.json b/terraform/060-simplesamlphp/task-definition.json
@@ -69,9 +69,13 @@
         "name": "THEME_USE",
         "value": "material:material"
       },
+      {
+        "name": "PASSWORD_CHANGE_URL",
+        "value": "${password_change_url}"
+      },
       {
         "name": "PASSWORD_FORGOT_URL",
-        "value": "${forgot_password_url}"
+        "value": "${password_forgot_url}"
       },
       {
         "name": "HUB_MODE",

diff --git a/terraform/060-simplesamlphp/vars.tf b/terraform/060-simplesamlphp/vars.tf
@@ -39,7 +39,11 @@ variable "docker_image" {
   type = "string"
 }
 
-variable "forgot_password_url" {
+variable "password_change_url" {
+  type = "string"
+}
+
+variable "password_forgot_url" {
   type = "string"
 }
 

diff --git a/terraform/070-id-sync/README.md b/terraform/070-id-sync/README.md
@@ -29,6 +29,7 @@ store.
  - `id_store_adapter` - Which ID Store adapter to use
  - `id_store_config` - A map of configuration data to pass into id-sync as env vars
  - `idp_name` - Short name of IdP for use in logs and email alerts
+ - `idp_display_name` - Friendly name for IdP
  - `ecs_cluster_id` - ID for ECS Cluster
  - `ecsServiceRole_arn` - ARN for ECS Service Role
  - `alb_dns_name` - DNS name for application load balancer
@@ -73,6 +74,7 @@ module "idsync" {
   id_store_adapter            = "${var.id_store_adapter}"
   id_store_config             = "${var.id_store_config}"
   idp_name                    = "${var.idp_name}"
+  idp_display_name            = "${var.idp_display_name}"
   ecs_cluster_id              = "${data.terraform_remote_state.core.ecs_cluster_id}"
   ecsServiceRole_arn          = "${data.terraform_remote_state.core.ecsServiceRole_arn}"
   alb_dns_name                = "${data.terraform_remote_state.cluster.alb_dns_name}"