Merge pull request #586 from Security-Onion-Solutions/dev

1.2.1-1

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
@@ -75,6 +75,7 @@ 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).

salt/registry/etc/config.yml

@@ -19,5 +19,4 @@ health:
     enabled: true
     interval: 10s
     threshold: 3
-proxy:
-  remoteurl: https://registry-1.docker.io
+

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