Skip to content

Commit

Permalink
feat(subdomain): Added subdomain option
Browse files Browse the repository at this point in the history
  • Loading branch information
CodingMadeEasy committed Nov 3, 2019
1 parent b164c71 commit fe7bae5
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 9 deletions.
23 changes: 16 additions & 7 deletions client.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ locals {
}
}

domains = concat(var.domains,
[for domain in var.domains : "nomad.${domain}"],
[for domain in var.domains : "consul.${domain}"],
[for domain in var.domains : "vault.${domain}"]
domains = concat(
[for domain in var.domains : "${join(".", compact([var.subdomain, domain]))}"],
[for domain in var.domains : "${join(".", compact(["nomad", var.subdomain, domain]))}"],
[for domain in var.domains : "${join(".", compact(["consul", var.subdomain, domain]))}"],
[for domain in var.domains : "${join(".", compact(["vault", var.subdomain, domain]))}"]
)
}

Expand Down Expand Up @@ -130,23 +131,31 @@ resource "godaddy_domain_record" "default" {
}

record {
name = "nomad"
name = coalesce(var.subdomain, "@")
type = "A"
data = "${google_compute_global_address.global_ip.address}"
ttl = 3600
priority = 0
}

record {
name = "consul"
name = join(".", compact(["nomad", var.subdomain]))
type = "A"
data = "${google_compute_global_address.global_ip.address}"
ttl = 3600
priority = 0
}

record {
name = "vault"
name = join(".", compact(["consul", var.subdomain]))
type = "A"
data = "${google_compute_global_address.global_ip.address}"
ttl = 3600
priority = 0
}

record {
name = join(".", compact(["vault", var.subdomain]))
type = "A"
data = "${google_compute_global_address.global_ip.address}"
ttl = 3600
Expand Down
3 changes: 2 additions & 1 deletion nomad.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "nomad" {
source = "git::https://github.com/Cosmic9Studios/terraform-nomad-job.git?ref=v2.0.0"
address = "http://nomad.${var.domains[0]}"
address = coalesce(var.nomad_address, "http://${join(".", compact(["nomad", var.subdomain, var.domains[0]]))}")
data = [
{
file_path = "${path.module}/nomad/fabio.nomad"
Expand All @@ -10,6 +10,7 @@ module "nomad" {
file_path = "${path.module}/nomad/vault.nomad"
vars = {
project = var.project
vault_bucket = var.vault_bucket_name
NOMAD_IP_lb = "$${NOMAD_IP_lb}"
}
}
Expand Down
2 changes: 1 addition & 1 deletion nomad/vault.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ job "vault" {
disable_mlock = true
storage "gcs" {
bucket = "c9s-vault"
bucket = "${vault_bucket}"
ha_enabled = "true"
}
Expand Down
4 changes: 4 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ variable "vault_bucket_name" {

# Optional Global Variables

variable "subdomain" {
default = ""
}

variable "nomad_address" {
default = ""
}
Expand Down

0 comments on commit fe7bae5

Please sign in to comment.