Updates to match master

Author: mcgirr

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

@@ -11,7 +11,6 @@ resource "aws_route53_record" "www" {
   name    = "www.${var.base_domain}."
   type    = "A"
   ttl     = "300"
-  # records = [ aws_instance.email_server.public_ip ]
   records = [ aws_eip.web_server.public_ip ]
 }
 
@@ -30,7 +29,6 @@ resource "aws_route53_record" "a" {
   name    = "${var.base_domain}."
   type    = "A"
   ttl     = "300"
-  # records = [ aws_instance.email_server.public_ip ]
   records = [ aws_eip.web_server.public_ip ]
 }
 

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

@@ -7,8 +7,7 @@
   ec2.hvm = true;
 
   networking = {
-    hostName = "mikemcgirr";
-    # TODO set with Terraform Template var
+    hostName = "${hostname}";
 
     enableIPv6 = true; 
 
@@ -38,11 +37,8 @@
         enableACME = true;
 
         locations."/" = {
-          # TODO set from an input variable
-          root = "/var/www/mikemcgirr-com/_site";
+          root = "/var/www/${content_location}/_site";
         };
-
-
       };
 
       # TODO combine this with the above so that this doesn't repeat itself 
@@ -53,10 +49,8 @@
         enableACME = true;
 
         locations."/" = {
-          # TODO set from an input variable
-          root = "/var/www/mikemcgirr-com/_site";
+          root = "/var/www/${content_location}/_site";
         };
-
       };
 
     };

modules/terraform-aws-nixos-webserver-wrapper/templates/init.sh.tpl

@@ -4,14 +4,13 @@
 
 ssh -i ./id_rsa root@${ip} "nix-channel --update && nixos-rebuild switch"
 
-ssh -i ./id_rsa root@${ip} "mkdir -p /var/www/mikemcgirr-com"
-# TODO set this with an input variable
+ssh -i ./id_rsa root@${ip} "mkdir -p /var/www/${content_location}"
 
-# then scp the website file at this point
-scp -i ./id_rsa -P 22 -r ../../mikemcgirr-com/_site root@${ip}:/var/www/mikemcgirr-com/.
-# TODO set this with an input variable
+# Then scp the website file at this point.
+# This assumes the static blog content you'd initially like to move over is located two directories up
+scp -i ./id_rsa -P 22 -r ../../${content_location}/_site root@${ip}:/var/www/${content_location}/.
 
 # then scp the configuration.nix file at this point
 scp -i ./id_rsa -P 22 configuration.nix root@${ip}:/etc/nixos/configuration.nix
 
-ssh -i ./id_rsa root@${ip} "nix-channel --update && nixos-rebuild switch"
+ssh -i ./id_rsa root@${ip} "nix-channel --update && nixos-rebuild switch"

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

@@ -8,11 +8,21 @@ variable "base_domain" {
   type        = string
 }
 
+variable "hostname" {
+  description = "The hostname to set on the AWS instance"
+  type        = string
+}
+
 variable "email" {
   description = "The email to use for the cert emails."
   type        = string
 }
 
+variable "content_location" {
+  description = "The location on the AWS instance where the web content will be located."
+  type        = string
+}
+
 variable "region" {
   description = "The region to create AWS resources in for the web server"
   type        = string
@@ -93,11 +103,8 @@ variable "vpc_extra_tags" {
   type        = map
 }
 
-# TODO review
-# if the description here is confusing, see the semantics that `merge()` uses:
-# https://www.terraform.io/docs/configuration/interpolation.html#merge-map1-map2-
 variable "extra_tags" {
-  description = "Extra tags that will be added to ALL RESOURCES, use the resource-specific variables if you need that level of control. Note that keys may be overwritten in cases where there are duplicates."
+  description = "Extra tags that will be added to all resources."
   default     = {} # TODO remove default
   type        = map
 }

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

@@ -11,7 +11,6 @@ module "web-server-sg" {
 module "web-server-ssh-rule" {
   source            = "fpco/foundation/aws//modules/ssh-sg"
   version           = "0.9.4"
-  # cidr_blocks       = var.allowed_remote_cidrs  # TODO maybe add a bastion host eventually
   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