From 469bd1bada8f23bd82f48bdafbb21a61f4ed54fb Mon Sep 17 00:00:00 2001
From: Riaan Nolan <riaan.nolan@gmail.com>
Date: Wed, 31 Jul 2024 12:52:51 +1000
Subject: [PATCH 1/6] updating motd

---
 hashiqube/basetools.sh | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/hashiqube/basetools.sh b/hashiqube/basetools.sh
index 23c67e3..791411b 100644
--- a/hashiqube/basetools.sh
+++ b/hashiqube/basetools.sh
@@ -43,6 +43,42 @@ cat <<EOF | sudo tee /etc/update-motd.d/00-header
 #!/bin/bash
 /usr/bin/toilet --gay -f standard hashiqube0 -w 170
 printf "%s"
+
+if [[ ${CODESPACES} == true ]]; then
+  printf "\n"
+  printf '\e[33;0;36m'"Welcome! You are running in a Github Codespace. The information below will help you get started!\n"
+  printf '\e[33;0;36m'"You are in the /vagrant folder because this lab also runs in Vagrant, and many of the scripts depends on this path.\n"
+  printf '\e[33;1;93m'" * Hashiqube Documentation: \e[38;5;198m https://hashiqube.com\n"
+  printf '\e[33;1;93m'" * Start Vault:             \e[38;5;198m bash vault/vault.sh\n"
+  printf '\e[33;1;93m'" * Access Vault Web UI:     \e[38;5;198m Click on the Globe in the Ports Tab in port 8200\n"
+  printf '\e[33;1;93m'" * Get Vault Root token:    \e[38;5;198m cat /etc/vault/init.file'\n"
+  printf '\e[33;1;93m'" * Get Vault Status:        \e[38;5;198m vault status\n"
+  printf '\e[33;1;93m'" * Start Nomad:             \e[38;5;198m bash nomad/nomad.sh\n"
+  printf '\e[33;1;93m'" * Access Nomad Web UI:     \e[38;5;198m Click on the Globe in the Ports Tab in port 4646\n"
+  printf '\e[33;1;93m'" * Get Nomad Job Status:    \e[38;5;198m nomad job status\n"
+  printf '\e[33;1;93m'" * Get Nomad Server Members:\e[38;5;198m nomad server members\n"
+  printf '\e[33;1;93m'" * Start Consul:            \e[38;5;198m bash consul/consul.sh\n"
+  printf '\e[33;1;93m'" * Access Consul Web UI:    \e[38;5;198m Click on the Globe in the Ports Tab in port 8500\n"
+  printf '\e[33;1;93m'" * Get Consul Info:         \e[38;5;198m consul info\n"
+  printf '\e[33;1;93m'" * Get Consul Members:      \e[38;5;198m consul members -wan\n"
+  printf '\e[33;1;93m'" * Start Terraform:         \e[38;5;198m bash localstack/localstack.sh\n"
+  printf '\e[33;1;93m'" * Terraform Plan/Apply:    \e[38;5;198m cd localstack; terraform plan; terraform apply;\n"
+  printf "\n"
+else
+  printf "\n"
+  printf '\e[33;0;36m'"You are running in something\n"
+  printf '\e[33;1;93m'" * Hashiqube Documentation:  \e[38;5;198m https://hashiqube.com\n"
+  printf '\e[33;1;93m'" * See User Data Log:        tail -f /var/log/user-data.log\n"
+  printf '\e[33;1;93m'" * Get Vault Root token:     vagrant ssh -c 'cat /etc/vault/init.file'\n"
+  printf '\e[33;1;93m'" * Get Vault Status:         vault status\n"
+  printf '\e[33;1;93m'" * Get Nomad Job Status:     nomad job status\n"
+  printf '\e[33;1;93m'" * Get Nomad Server Members: nomad server members\n"
+  printf '\e[33;1;93m'" * Get Consul Info:          consul info\n"
+  printf '\e[33;1;93m'" * Get Consul Members:       consul members -wan\n"
+  printf '\e[33;1;93m'" * Get Waypoint Token:       vagrant ssh -c 'cat /home/vagrant/.waypoint-nomad-token'\n"
+  printf '\e[33;1;93m'" * SSH into Hashiqube:       cd hashiqube; vagrant ssh\n"
+  printf "\n"
+fi
 EOF
 
 echo -e '\e[38;5;198m'"++++ "

From bedd1d41bb838bedffaafefcac3cb83cb7c917ac Mon Sep 17 00:00:00 2001
From: Riaan Nolan <riaan.nolan@gmail.com>
Date: Wed, 31 Jul 2024 12:53:54 +1000
Subject: [PATCH 2/6] updating motd

---
 .devcontainer/devcontainer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 861c3da..3f0c296 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,8 @@
   "postStartCommand": {
     "set-git-config-safe-directory": "git config --global --add safe.directory ${containerWorkspaceFolder}",
     "set-git-config-line-endings": "git config --global core.autocrlf input",
-    "set-git-config-gpg-program": "git config --global --add gpg.program /usr/bin/gpg"
+    "set-git-config-gpg-program": "git config --global --add gpg.program /usr/bin/gpg",
+    "print-message-of-the-day": "bash /etc/update-motd.d/00-header"
   },
   "customizations": {
     "vscode": {

From d9e1651cca7e263197798a58fa0c32db945e734e Mon Sep 17 00:00:00 2001
From: Riaan Nolan <riaan.nolan@gmail.com>
Date: Wed, 31 Jul 2024 13:07:51 +1000
Subject: [PATCH 3/6] updating motd

---
 .devcontainer/devcontainer.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3f0c296..bae3cdd 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,9 @@
   "postStartCommand": {
     "set-git-config-safe-directory": "git config --global --add safe.directory ${containerWorkspaceFolder}",
     "set-git-config-line-endings": "git config --global core.autocrlf input",
-    "set-git-config-gpg-program": "git config --global --add gpg.program /usr/bin/gpg",
+    "set-git-config-gpg-program": "git config --global --add gpg.program /usr/bin/gpg"
+  },
+  "postCreateCommand": {
     "print-message-of-the-day": "bash /etc/update-motd.d/00-header"
   },
   "customizations": {

From 099140ffd46c407f3b7b808d3c518e94a08d13b9 Mon Sep 17 00:00:00 2001
From: Riaan Nolan <riaan.nolan@gmail.com>
Date: Wed, 31 Jul 2024 13:21:49 +1000
Subject: [PATCH 4/6] updating motd

---
 hashiqube/basetools.sh | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/hashiqube/basetools.sh b/hashiqube/basetools.sh
index 791411b..d9e5f4d 100644
--- a/hashiqube/basetools.sh
+++ b/hashiqube/basetools.sh
@@ -44,10 +44,11 @@ cat <<EOF | sudo tee /etc/update-motd.d/00-header
 /usr/bin/toilet --gay -f standard hashiqube0 -w 170
 printf "%s"
 
-if [[ ${CODESPACES} == true ]]; then
+if [[ $CODESPACES == true ]]; then
   printf "\n"
-  printf '\e[33;0;36m'"Welcome! You are running in a Github Codespace. The information below will help you get started!\n"
+  printf '\e[33;0;36m'"Welcome! You are running HashiQube in a Github Codespace. The information below will help you get started!\n"
   printf '\e[33;0;36m'"You are in the /vagrant folder because this lab also runs in Vagrant, and many of the scripts depends on this path.\n"
+  printf "\n"
   printf '\e[33;1;93m'" * Hashiqube Documentation: \e[38;5;198m https://hashiqube.com\n"
   printf '\e[33;1;93m'" * Start Vault:             \e[38;5;198m bash vault/vault.sh\n"
   printf '\e[33;1;93m'" * Access Vault Web UI:     \e[38;5;198m Click on the Globe in the Ports Tab in port 8200\n"
@@ -66,17 +67,24 @@ if [[ ${CODESPACES} == true ]]; then
   printf "\n"
 else
   printf "\n"
-  printf '\e[33;0;36m'"You are running in something\n"
-  printf '\e[33;1;93m'" * Hashiqube Documentation:  \e[38;5;198m https://hashiqube.com\n"
-  printf '\e[33;1;93m'" * See User Data Log:        tail -f /var/log/user-data.log\n"
-  printf '\e[33;1;93m'" * Get Vault Root token:     vagrant ssh -c 'cat /etc/vault/init.file'\n"
-  printf '\e[33;1;93m'" * Get Vault Status:         vault status\n"
-  printf '\e[33;1;93m'" * Get Nomad Job Status:     nomad job status\n"
-  printf '\e[33;1;93m'" * Get Nomad Server Members: nomad server members\n"
-  printf '\e[33;1;93m'" * Get Consul Info:          consul info\n"
-  printf '\e[33;1;93m'" * Get Consul Members:       consul members -wan\n"
-  printf '\e[33;1;93m'" * Get Waypoint Token:       vagrant ssh -c 'cat /home/vagrant/.waypoint-nomad-token'\n"
-  printf '\e[33;1;93m'" * SSH into Hashiqube:       cd hashiqube; vagrant ssh\n"
+  printf '\e[33;0;36m'"Welcome! You are running HashiQube. The information below will help you get started!\n"
+  printf '\e[33;0;36m'"You are in the /vagrant folder because this lab also runs in Vagrant, and many of the scripts depends on this path.\n"
+  printf "\n"
+  printf '\e[33;1;93m'" * Hashiqube Documentation: \e[38;5;198m https://hashiqube.com\n"
+  printf '\e[33;1;93m'" * Start Vault:             \e[38;5;198m bash vault/vault.sh\n"
+  printf '\e[33;1;93m'" * Access Vault Web UI:     \e[38;5;198m Open http://localhost:8200\n"
+  printf '\e[33;1;93m'" * Get Vault Root token:    \e[38;5;198m cat /etc/vault/init.file'\n"
+  printf '\e[33;1;93m'" * Get Vault Status:        \e[38;5;198m vault status\n"
+  printf '\e[33;1;93m'" * Start Nomad:             \e[38;5;198m bash nomad/nomad.sh\n"
+  printf '\e[33;1;93m'" * Access Nomad Web UI:     \e[38;5;198m Open http://localhost:4646\n"
+  printf '\e[33;1;93m'" * Get Nomad Job Status:    \e[38;5;198m nomad job status\n"
+  printf '\e[33;1;93m'" * Get Nomad Server Members:\e[38;5;198m nomad server members\n"
+  printf '\e[33;1;93m'" * Start Consul:            \e[38;5;198m bash consul/consul.sh\n"
+  printf '\e[33;1;93m'" * Access Consul Web UI:    \e[38;5;198m Open http://localhost:8500\n"
+  printf '\e[33;1;93m'" * Get Consul Info:         \e[38;5;198m consul info\n"
+  printf '\e[33;1;93m'" * Get Consul Members:      \e[38;5;198m consul members -wan\n"
+  printf '\e[33;1;93m'" * Start Terraform:         \e[38;5;198m bash localstack/localstack.sh\n"
+  printf '\e[33;1;93m'" * Terraform Plan/Apply:    \e[38;5;198m cd localstack; terraform plan; terraform apply;\n"
   printf "\n"
 fi
 EOF

From ae30d21e8fd3c619f1ce8d76137b6da8c13dba30 Mon Sep 17 00:00:00 2001
From: Riaan Nolan <riaan.nolan@gmail.com>
Date: Wed, 31 Jul 2024 13:26:48 +1000
Subject: [PATCH 5/6] updating motd

---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bae3cdd..050f267 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
     "set-git-config-line-endings": "git config --global core.autocrlf input",
     "set-git-config-gpg-program": "git config --global --add gpg.program /usr/bin/gpg"
   },
-  "postCreateCommand": {
+  "postAttachCommand": {
     "print-message-of-the-day": "bash /etc/update-motd.d/00-header"
   },
   "customizations": {

From dc569fd8e71348d0eedd988e377fb455ff01bdbf Mon Sep 17 00:00:00 2001
From: Riaan Nolan <riaan.nolan@gmail.com>
Date: Wed, 31 Jul 2024 13:31:17 +1000
Subject: [PATCH 6/6] updating motd

---
 hashiqube/basetools.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hashiqube/basetools.sh b/hashiqube/basetools.sh
index d9e5f4d..afcc521 100644
--- a/hashiqube/basetools.sh
+++ b/hashiqube/basetools.sh
@@ -44,7 +44,7 @@ cat <<EOF | sudo tee /etc/update-motd.d/00-header
 /usr/bin/toilet --gay -f standard hashiqube0 -w 170
 printf "%s"
 
-if [[ $CODESPACES == true ]]; then
+if [[ \$CODESPACES == true ]]; then
   printf "\n"
   printf '\e[33;0;36m'"Welcome! You are running HashiQube in a Github Codespace. The information below will help you get started!\n"
   printf '\e[33;0;36m'"You are in the /vagrant folder because this lab also runs in Vagrant, and many of the scripts depends on this path.\n"