Merge branch 'main' of github.com:IBM/infra-to-app-with-landing-zone into main

vburckhardt · vburckhardt · commit f904b281e2b2 · 2023-09-08T10:00:57.000+01:00
diff --git a/README.md b/README.md
@@ -4,4 +4,4 @@ This deployable architecture automates all of the deployment steps to:
  1. Provision a VPC-based topology aligned with best practices from the [IBM Cloud Framework for Financial Services](https://cloud.ibm.com/docs/framework-financial-services?topic=framework-financial-services-vpc-architecture-about).
  2. Deploy an Apache web server on top of this secure topology
 
-This deployable architecture is built in the context of the lab *Seamless Deployment: From Provisioning to Runtime with IBM Cloud’s Landing Zone lab*. Instructions for the lab can be found at: https://ibm.github.io/infra-to-app-with-landing-zone/
+This deployable architecture is built in the context of the lab *Seamless Deployment: From Provisioning to Runtime with IBM Cloud’s Landing Zone*. Instructions for the lab can be found at: https://ibm.github.io/infra-to-app-with-landing-zone/
diff --git a/app-install/main.tf b/app-install/main.tf
@@ -30,4 +30,14 @@ resource "null_resource" "application-install" {
       "apt-get install apache2 -y"
     ]
   }
+
+  provisioner "file" {
+    content = <<EOT
+<html>
+<img src="https://raw.githubusercontent.com/IBM/infra-to-app-with-landing-zone/main/docs/header.jpg">
+<h1> You did it!! </h1>
+</html>    
+EOT
+    destination = "/var/www/html/index.html"
+  }
 }
diff --git a/lab/step2/apache.tf b/lab/step2/apache.tf
@@ -37,6 +37,16 @@ resource "null_resource" "application-install" {
       "apt-get install apache2 -y"
     ]
   }
+
+  provisioner "file" {
+    content = <<EOT
+<html>
+<img src="https://raw.githubusercontent.com/IBM/infra-to-app-with-landing-zone/main/docs/header.jpg">
+<h1> You did it!! </h1>
+</html>    
+EOT
+    destination = "/var/www/html/index.html"
+  }
 }
 
 # Extra variable required to allow to connect to the workload vsis through the management vsi

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,14 @@ resource "null_resource" "application-install" {`
`30`	`30`	`"apt-get install apache2 -y"`
`31`	`31`	`]`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ provisioner "file" {`
	`35`	`+ content = <<EOT`
	`36`	`+<html>`
	`37`	`+<img src="https://raw.githubusercontent.com/IBM/infra-to-app-with-landing-zone/main/docs/header.jpg">`
	`38`	`+<h1> You did it!! </h1>`
	`39`	`+</html>`
	`40`	`+EOT`
	`41`	`+ destination = "/var/www/html/index.html"`
	`42`	`+ }`
`33`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,16 @@ resource "null_resource" "application-install" {`
`37`	`37`	`"apt-get install apache2 -y"`
`38`	`38`	`]`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ provisioner "file" {`
	`42`	`+ content = <<EOT`
	`43`	`+<html>`
	`44`	`+<img src="https://raw.githubusercontent.com/IBM/infra-to-app-with-landing-zone/main/docs/header.jpg">`
	`45`	`+<h1> You did it!! </h1>`
	`46`	`+</html>`
	`47`	`+EOT`
	`48`	`+ destination = "/var/www/html/index.html"`
	`49`	`+ }`
`40`	`50`	`}`
`41`	`51`
`42`	`52`	`# Extra variable required to allow to connect to the workload vsis through the management vsi`