Advertisement
Guest User

Untitled

a guest
Sep 27th, 2016
70
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.32 KB | None | 0 0
  1. diff --git a/accounts/nubis-lab/terraform.tfvars b/accounts/nubis-lab/terraform.tfvars
  2. index e3eca5e..13d47f1 100644
  3. --- a/accounts/nubis-lab/terraform.tfvars
  4. +++ b/accounts/nubis-lab/terraform.tfvars
  5. @@ -39,3 +39,8 @@ ci.admins = "gozer,tinnightcap,limed"
  6.  
  7.  
  8. my_ip = "0.0.0.0/0"
  9. +
  10. +usermanagment.ldapuser = "foo"
  11. +usermanagment.ldappassword = "xxcxxc"
  12. +usermanagmeent.tls_key = "usermanagmenet.key"
  13. +usermanagmeent.tls_crt = "usermanagmenet.crt"
  14. diff --git a/modules/meta/main.tf b/modules/meta/main.tf
  15. index dd6988a..edd4317 100644
  16. --- a/modules/meta/main.tf
  17. +++ b/modules/meta/main.tf
  18. @@ -196,7 +196,3 @@ output "CredstashDynamoDB" {
  19. output "HostedZoneNS" {
  20. value = "${aws_route53_zone.hosted_zone.name_servers.0},${aws_route53_zone.hosted_zone.name_servers.1},${aws_route53_zone.hosted_zone.name_servers.2},${aws_route53_zone.hosted_zone.name_servers.3}"
  21. }
  22. -
  23. -output "DefaultServerCertificate" {
  24. - value = "${aws_iam_server_certificate.default.arn}"
  25. -}
  26. diff --git a/modules/vpc/main.tf b/modules/vpc/main.tf
  27. index 96368df..41eb079 100644
  28. --- a/modules/vpc/main.tf
  29. +++ b/modules/vpc/main.tf
  30. @@ -1068,6 +1068,8 @@ module "user_management" {
  31.  
  32. credstash_key = "${module.meta.CredstashKeyID}"
  33. credstash_db = "${module.meta.CredstashDynamoDB}"
  34. +
  35. + cert = "${file(var.usermanagment_cert)}"
  36. }
  37.  
  38. #XXX: Move to a module
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement