From c31d68a18c13a31e601779c66af366c39d37ce45 Mon Sep 17 00:00:00 2001
From: Rob Gil <dds@rem5.com>
Date: Thu, 23 Jan 2020 10:50:16 -0500
Subject: [PATCH] Makes client vpn cidr range configurable

---
 terraform/modules/vpc/main.tf        | 2 +-
 terraform/modules/vpc/variables.tf   | 6 ++++++
 terraform/providers/dev/variables.tf | 8 +++++++-
 terraform/providers/dev/vpc.tf       | 1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/terraform/modules/vpc/main.tf b/terraform/modules/vpc/main.tf
index a27f2139..d0ea9a2a 100644
--- a/terraform/modules/vpc/main.tf
+++ b/terraform/modules/vpc/main.tf
@@ -110,7 +110,7 @@ resource "azurerm_virtual_network_gateway" "vnet_gateway" {
   }
 
   vpn_client_configuration {
-    address_space        = ["172.16.1.0/24"]
+    address_space        = var.vpn_client_cidr
     vpn_client_protocols = ["OpenVPN"]
   }
 }
\ No newline at end of file
diff --git a/terraform/modules/vpc/variables.tf b/terraform/modules/vpc/variables.tf
index ac2dbac9..aae7ef45 100644
--- a/terraform/modules/vpc/variables.tf
+++ b/terraform/modules/vpc/variables.tf
@@ -52,3 +52,9 @@ variable "service_endpoints" {
   description = "A map of the service endpoints and its mapping to subnets"
 
 }
+
+variable "vpn_client_cidr" {
+  type        = list
+  description = "The CIDR range used for clients on the VPN"
+  default     = ["172.16.0.0/16"]
+}
diff --git a/terraform/providers/dev/variables.tf b/terraform/providers/dev/variables.tf
index 573b6cc9..467f806c 100644
--- a/terraform/providers/dev/variables.tf
+++ b/terraform/providers/dev/variables.tf
@@ -91,6 +91,12 @@ variable "admin_users" {
 variable "admin_user_whitelist" {
   type = map
   default = {
-    "Rob Gil" = "66.220.238.246"
+    "Rob Gil"           = "66.220.238.246"
+    "Dan Corrigan Work" = "108.16.207.173"
   }
 }
+
+variable "vpn_client_cidr" {
+  type    = list
+  default = ["172.16.255.0/24"]
+}
diff --git a/terraform/providers/dev/vpc.tf b/terraform/providers/dev/vpc.tf
index 44ecf35c..8d43a82f 100644
--- a/terraform/providers/dev/vpc.tf
+++ b/terraform/providers/dev/vpc.tf
@@ -10,5 +10,6 @@ module "vpc" {
   name              = var.name
   dns_servers       = var.dns_servers
   service_endpoints = var.service_endpoints
+  vpn_client_cidr   = var.vpn_client_cidr
 }