Updates to match master

Author: mcgirr

modules/terraform-aws-nixos-webserver-wrapper/templates/configuration.nix.tpl

@@ -39,8 +39,6 @@
         locations."/" = {
           root = "/var/www/${content_location}/_site";
         };
-
-
       };
 
       # TODO combine this with the above so that this doesn't repeat itself 
@@ -53,7 +51,6 @@
         locations."/" = {
           root = "/var/www/${content_location}/_site";
         };
-
       };
 
     };

modules/terraform-aws-nixos-webserver-wrapper/webserver-sg.tf

@@ -13,8 +13,7 @@ module "web-server-ssh-rule" {
   version           = "0.9.4"
 <<<<<<< HEAD
 =======
-  # cidr_blocks       = var.allowed_remote_cidrs  # TODO maybe add a bastion host eventually
->>>>>>> Update module wrapper name
+>>>>>>> Updates to match master
   cidr_blocks       = ["0.0.0.0/0" ]
   # ipv6_cidr_blocks  = ["::/0" ] # TODO add ipv6 to the upstream module
   security_group_id = module.web-server-sg.id
@@ -60,8 +59,4 @@ module "web-server-https-rule" {
   security_group_id = module.web-server-sg.id
 }
 
-<<<<<<< HEAD
-# TODO add ping icmp 
-=======
 # TODO add ping icmp
->>>>>>> Update module wrapper name