From 7d2f4d70923fee4ec139068a4b5257f0d96856cc Mon Sep 17 00:00:00 2001
From: coltoneshaw <colton@theshaw.group>
Date: Fri, 17 Mar 2023 10:35:04 -0400
Subject: [PATCH 1/4] The sven fix. show defaults in create command

---
 scripts/general.sh    | 2 +-
 scripts/mattermost.sh | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/general.sh b/scripts/general.sh
index 7af7ad4..94d7601 100755
--- a/scripts/general.sh
+++ b/scripts/general.sh
@@ -3,7 +3,7 @@
 logins () {
   echo ===========================================================
   echo
-  echo "- Mattermost: http://localhost:8065" with the logins above
+  echo "- Mattermost: http://localhost:8065" with the logins above if you ran setup
   echo "- Keycloak: http://localhost:8080" with 'admin' / 'admin'
   echo "- Grafana: http://localhost:3000" with 'admin' / 'admin'
   echo "    - All Mattermost Grafana charts are setup."
diff --git a/scripts/mattermost.sh b/scripts/mattermost.sh
index e3b7acc..b43fcef 100755
--- a/scripts/mattermost.sh
+++ b/scripts/mattermost.sh
@@ -15,7 +15,7 @@ setup() {
     echo "If you are curious about the config changes check out the file ./files/mattermost/defaultConfig.json"
     echo "If you don't want to do this, just press enter."
     echo
-    read -p "Y / N   " -n 1 -r
+    read -p "y / N   " -n 1 -r
     echo # (optional) move to a new line
     if [[ $REPLY =~ ^[Yy]$ ]]; then
       echo ===========================================================
@@ -30,6 +30,9 @@ setup() {
 
       echoLogins
       exit 0
+    else 
+      echo "skipping test Data setup for Mattermost"
+      exit 0
     fi
   fi
 

From 4c0779f7f2de82254eb9aa030acfd743e04f87f7 Mon Sep 17 00:00:00 2001
From: coltoneshaw <colton@theshaw.group>
Date: Fri, 17 Mar 2023 10:35:30 -0400
Subject: [PATCH 2/4] Changed make stop to use docker-compose stop

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3270e97..201efb6 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ start:
 	
 stop:
 	@echo "Stopping..."
-	@docker-compose down
+	@docker-compose stop
 	@echo "Done"
 
 restart:

From f5a6d4769727c8c6696ce054aaabc6a265af52ab Mon Sep 17 00:00:00 2001
From: coltoneshaw <colton@theshaw.group>
Date: Fri, 17 Mar 2023 10:38:20 -0400
Subject: [PATCH 3/4] some readme changes

---
 README.md | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index c89da84..cce0bb8 100644
--- a/README.md
+++ b/README.md
@@ -17,11 +17,12 @@ Additionally, the keycloak container can take up to 5 minutes to spin up. If it'
 
   You'll be prompted on setting up the test data.
 
-  ```
+  ```make
   make start
   ```
 
 3. Sign into Mattermost
+
   - You can use any of the accounts to sign in.
   - The keycloak container can be **very** picky sometimes and require a restart of just that container to sign in with that method the first time.
 
@@ -72,21 +73,23 @@ Destroys everything (Except your life).
 | zoidberg  | zoidberg  | User          | Member          | Yes           | Yes           |
 | amy       | amy       | User          | Member          | Yes           | Yes           |
 
-# Guides
+## Guides
 
-## How to upgrade
+### How to upgrade
 
 1. Modify the line in the `docker-compose.yml` file to be the version you want
 
   You're just replacing the tag at the end, ths one is `7.7` for example. It must be a version of Mattermost that exists on Docker.
 
-  ```
+  ```bash
   mattermost/mattermost-enterprise-edition:release-7.7
   ```
+
 2. Run `make restart-mattermost`
+
   This will bounce the Mattermost container only.
 
-## How to upgrade
+### How to Downgrade
 
 Doing this will wipe anything you have in the database and any existing Mattermost config. If you desire to manually downgrade, follow the upgrade steps but in reverse. Note you might have some issues with the patch config and such.
 
@@ -94,12 +97,14 @@ Doing this will wipe anything you have in the database and any existing Mattermo
 
   You're just replacing the tag at the end, ths one is `7.7` for example. It must be a version of Mattermost that exists on Docker.
 
-  ```
+  ```bash
   mattermost/mattermost-enterprise-edition:release-7.7
   ```
   
 2. Run `make downgrade`
+
   This will:
+
   - delete the database
   - Restart the database container
   - Restart the Mattermost container

From 83ffa274d98c675c81797adb660b28b84579fa09 Mon Sep 17 00:00:00 2001
From: coltoneshaw <colton@theshaw.group>
Date: Fri, 17 Mar 2023 10:39:17 -0400
Subject: [PATCH 4/4] update gitignore for ds_store

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 343d029..a90f359 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ license.txt
 ## Ignoring keycloak so it can be pulled already setup.
 volumes
 
-.DS_Store
+**/.DS_Store
\ No newline at end of file