update domain

sidpalas · Feb 13, 2022 · 0fdc55d · 0fdc55d
1 parent d276ae7
commit 0fdc55d
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -1,10 +1,9 @@
 name: "Terraform"
 
 on:
-  # Uncomment to enable staging deployment
-  # push:
-  #   branches:
-  #     - main
+  push:
+    branches:
+      - main
   release:
     types: [published]
   pull_request:

diff --git a/03-basics/web-app/main.tf b/03-basics/web-app/main.tf
@@ -182,12 +182,12 @@ resource "aws_lb" "load_balancer" {
 }
 
 resource "aws_route53_zone" "primary" {
-  name = "mysuperawesomesite.com"
+  name = "devopsdeployed.com"
 }
 
 resource "aws_route53_record" "root" {
   zone_id = aws_route53_zone.primary.zone_id
-  name    = "mysuperawesomesite.com"
+  name    = "devopsdeployed.com"
   type    = "A"
 
   alias {

diff --git a/04-variables-and-outputs/web-app/terraform.tfvars b/04-variables-and-outputs/web-app/terraform.tfvars
@@ -1,5 +1,5 @@
 bucket_name = "devops-directive-web-app-data"
-domain      = "mysuperawesomesite.com"
+domain      = "devopsdeployed.com"
 db_name     = "mydb"
 db_user     = "foo"
-# db_pass = "foobarbaz"
+# db_pass = "foobarbaz"
diff --git a/06-organization-and-modules/web-app/main.tf b/06-organization-and-modules/web-app/main.tf
@@ -22,7 +22,7 @@ provider "aws" {
 }
 
 variable "db_pass_1" {
-  description = "password for database #2"
+  description = "password for database #1"
   type        = string
   sensitive   = true
 }
@@ -38,7 +38,7 @@ module "web_app_1" {
 
   # Input Variables
   bucket_name      = "web-app-1-devops-directive-web-app-data"
-  domain           = "mysuperawesomesite.com"
+  domain           = "devopsdeployed.com"
   app_name         = "web-app-1"
   environment_name = "production"
   instance_type    = "t2.small"
@@ -53,7 +53,7 @@ module "web_app_2" {
 
   # Input Variables
   bucket_name      = "web-app-2-devops-directive-web-app-data"
-  domain           = "myothersuperawesomesite.com"
+  domain           = "anotherdevopsdeployed.com"
   app_name         = "web-app-2"
   environment_name = "production"
   instance_type    = "t2.small"

diff --git a/07-managing-multiple-environments/file-structure/README.md b/07-managing-multiple-environments/file-structure/README.md
@@ -1,4 +1,4 @@
-- Note about using separate AWS projects (avoids prefix issues, improved IAM control)
+- Note about using separate AWS accounts (avoids prefix issues, improved IAM control)
   - Cover this in advanced section?
 
 ```

diff --git a/07-managing-multiple-environments/file-structure/global/main.tf b/07-managing-multiple-environments/file-structure/global/main.tf
@@ -23,5 +23,5 @@ provider "aws" {
 
 # Route53 zone is shared across staging and production
 resource "aws_route53_zone" "primary" {
-  name  = "mysuperawesomesite.com"
-}
+  name = "devopsdeployed.com"
+}
diff --git a/07-managing-multiple-environments/file-structure/production/main.tf b/07-managing-multiple-environments/file-structure/production/main.tf
@@ -36,7 +36,7 @@ module "web_app" {
 
   # Input Variables
   bucket_name      = "devops-directive-web-app-data-${local.environment_name}"
-  domain           = "mysuperawesomesite.com"
+  domain           = "devopsdeployed.com"
   environment_name = local.environment_name
   instance_type    = "t2.small"
   create_dns_zone  = false

diff --git a/07-managing-multiple-environments/file-structure/staging/main.tf b/07-managing-multiple-environments/file-structure/staging/main.tf
@@ -36,7 +36,7 @@ module "web_app" {
 
   # Input Variables
   bucket_name      = "devops-directive-web-app-data-${local.environment_name}"
-  domain           = "mysuperawesomesite.com"
+  domain           = "devopsdeployed.com"
   environment_name = local.environment_name
   instance_type    = "t2.micro"
   create_dns_zone  = false

diff --git a/07-managing-multiple-environments/workspaces/main.tf b/07-managing-multiple-environments/workspaces/main.tf
@@ -36,7 +36,7 @@ module "web_app" {
 
   # Input Variables
   bucket_name      = "devops-directive-web-app-data-${local.environment_name}"
-  domain           = "mysuperawesomesite.com"
+  domain           = "devopsdeployed.com"
   environment_name = local.environment_name
   instance_type    = "t2.small"
   create_dns_zone  = terraform.workspace == "production" ? true : false