From 6725ecb1180ab07644f0f901d5925a2d1f9ffd66 Mon Sep 17 00:00:00 2001
From: lalanza808 <lance@lzahq.tech>
Date: Mon, 6 Jul 2020 08:38:44 -0700
Subject: [PATCH] adding wip code on improvements to wgas

---
 network/wireguard-as/compute.tf             | 2 +-
 network/wireguard-as/files/vpn_user_data.sh | 5 +++--
 network/wireguard-as/variables.tf           | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/network/wireguard-as/compute.tf b/network/wireguard-as/compute.tf
index e06ff1e..9a1ee5e 100644
--- a/network/wireguard-as/compute.tf
+++ b/network/wireguard-as/compute.tf
@@ -24,7 +24,7 @@ module "vpn_asg" {
     ENDPOINT = aws_eip.vpn.public_ip
     REGION = data.aws_region.current.name
     CONFIG_BUCKET = aws_s3_bucket.configs.id
-    WIREGUARD_INTERFACE = var.wireguard_interface
+    WIREGUARD_NETWORK = var.wireguard_network
     WIREGUARD_PORT = var.wireguard_vpn_port
     CLIENT_ROUTE = var.client_route
     AUTO_UPGRADE = var.auto_upgrade
diff --git a/network/wireguard-as/files/vpn_user_data.sh b/network/wireguard-as/files/vpn_user_data.sh
index 0b61d21..b68209b 100644
--- a/network/wireguard-as/files/vpn_user_data.sh
+++ b/network/wireguard-as/files/vpn_user_data.sh
@@ -19,6 +19,7 @@ export WGAS_SUDO=true
 export WGAS_DNS=$INSTANCE_PRIVATE_IP
 export WGAS_ROUTE=${CLIENT_ROUTE}
 export WGAS_PORT=${WIREGUARD_PORT}
+export WGAS_NETWORK=${WIREGUARD_NETWORK}
 
 
 # Update package meta
@@ -59,8 +60,8 @@ else
   wg genkey | tee $WG_HOME/privkey | wg pubkey > $WG_HOME/pubkey
   cat << EOF > $WG_HOME/wg0.conf
 [Interface]
-Address = ${WIREGUARD_INTERFACE}
-ListenPort = ${WIREGUARD_PORT}
+Address = $WGAS_NETWORK
+ListenPort = $WGAS_PORT
 PrivateKey = $(cat $WG_HOME/privkey)
 SaveConfig = true
 EOF
diff --git a/network/wireguard-as/variables.tf b/network/wireguard-as/variables.tf
index 85201e8..725c426 100644
--- a/network/wireguard-as/variables.tf
+++ b/network/wireguard-as/variables.tf
@@ -41,7 +41,7 @@ variable "public_subnets" {
   description = "List of subnets for deploying WireGuard VPN servers into"
 }
 
-variable "wireguard_interface" {
+variable "wireguard_network" {
   default = "10.66.66.1/24"
   description = "VPN tunnel interface IP and CIDR"
 }