From eebc75d2452c1c23d296f6bb68acc5548648ed29 Mon Sep 17 00:00:00 2001
From: Doug Burks <doug.burks@gmail.com>
Date: Sat, 18 Apr 2020 06:48:12 -0400
Subject: [PATCH 1/4] Update README.md

---
 README.md | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 01452a210..7164d616e 100644
--- a/README.md
+++ b/README.md
@@ -31,15 +31,6 @@
 - Due to the move to ECS, the current Playbook plays may not alert correctly at this time.
 - The osquery MacOS package does not install correctly.
 
-
-## Version 1.2.1 Beta 1 ISO Download
-
-[HH1.2.1-6.ISO](https://download.securityonion.net/file/Hybrid-Hunter/HH-1.2.1-6.iso)  
-
-MD5: D7E66CA8AAC37E70E2A2F7BB12EB3C23  
-SHA1: D91D921896F9ADA600EBA0ADAA548D8630B5341F  
-SHA256: D69E327597AB429DCE13C1177BCE6C1FAD934E78A09F73D14778C2CAE616557B  
-
 ### Warnings and Disclaimers
 
 - This BETA release is BLEEDING EDGE and TOTALLY UNSUPPORTED!  
@@ -67,21 +58,24 @@ Distributed:
 - Minimum 4 CPU cores per VM
 - Minimum 2 NICs for forward nodes
 
-### Prerequisites for Network Based Install
+### Installation
 
-Install git if using a Centos 7 Minimal install:
+For most users, we recommend installing using [our ISO image](https://github.com/Security-Onion-Solutions/securityonion-saltstack/wiki/ISO).
+
+If instead you would like to try a manual installation (not using our ISO), you can build from CentOS 7 or Ubuntu 18.04.
+
+If using CentOS 7 Minimal, you will need to install git:
 
 ```sudo yum -y install git```
 
-### Installation
-
-Once you resolve those requirements or are using Ubuntu 16.04 do the following:
+Once you have git, then do the following:
 
 ```
 git clone https://github.com/Security-Onion-Solutions/securityonion-saltstack
 cd securityonion-saltstack
 sudo bash so-setup-network
 ```
+
 Follow the prompts and reboot if asked to do so.
 
 Then proceed to the [Hybrid Hunter Quick Start Guide](https://github.com/Security-Onion-Solutions/securityonion-saltstack/wiki/Hybrid-Hunter-Quick-Start-Guide).

From ea7dd0763f0e150a866291ccf9203902699e7dab Mon Sep 17 00:00:00 2001
From: Doug Burks <doug.burks@gmail.com>
Date: Sat, 18 Apr 2020 06:50:17 -0400
Subject: [PATCH 2/4] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7164d616e..1b7661956 100644
--- a/README.md
+++ b/README.md
@@ -46,14 +46,14 @@
 
 Evaluation Mode:
 
-- ISO or a Single VM running Ubuntu 16.04 or CentOS 7
+- ISO or a Single VM running Ubuntu 18.04 or CentOS 7
 - Minimum 12GB of RAM
 - Minimum 4 CPU cores
 - Minimum 2 NICs
 
 Distributed:
 
-- 3 VMs running the ISO or Ubuntu 16.04 or CentOS 7 (You can mix and match)
+- 3 VMs running the ISO or Ubuntu 18.04 or CentOS 7 (You can mix and match)
 - Minimum 8GB of RAM per VM
 - Minimum 4 CPU cores per VM
 - Minimum 2 NICs for forward nodes

From f271fadfecbbf79e327b9b034202d8700482f33b Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Mon, 20 Apr 2020 15:28:13 -0400
Subject: [PATCH 3/4] Fix tarball

---
 setup/so-functions | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index ef635c47b..3402dd6b1 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -603,9 +603,9 @@ docker_seed_registry() {
     "so-soctopus:$VERSION" \
     "so-steno:$VERSION" \
     "so-strelka-frontend:$VERSION" \
-	"so-strelka-manager:$VERSION" \
-	"so-strelka-backend:$VERSION" \
-	"so-strelka-filestream:$VERSION" \
+    "so-strelka-manager:$VERSION" \
+    "so-strelka-backend:$VERSION" \
+    "so-strelka-filestream:$VERSION" \
     "so-suricata:$VERSION" \
     "so-telegraf:$VERSION" \
     "so-thehive:$VERSION" \
@@ -645,6 +645,8 @@ docker_seed_registry() {
     done
   else
     # We already have the goods son
+    cd /nsm/docker-registry/docker
+    tar xvf so-dockers-$VERSION.tar
     rm /nsm/docker-registry/docker/so-dockers-$VERSION.tar
   fi
 

From c024bdf427ebc18066aebc98ea6c1e9700428225 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Mon, 20 Apr 2020 15:31:13 -0400
Subject: [PATCH 4/4] remove proxy declaration

---
 salt/registry/etc/config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/salt/registry/etc/config.yml b/salt/registry/etc/config.yml
index d25a034b0..ccd64aa25 100644
--- a/salt/registry/etc/config.yml
+++ b/salt/registry/etc/config.yml
@@ -19,5 +19,4 @@ health:
     enabled: true
     interval: 10s
     threshold: 3
-proxy:
-  remoteurl: https://registry-1.docker.io
+