check for sosetup-elastic and /opt/elastic/src before offering Experi…

…mental option

bin/sosetup

@@ -196,6 +196,7 @@ fi
 #########################################
 # Stable Setup or Experimental Setup
 #########################################
+if [ -f /usr/sbin/sosetup-elastic ] && [ -d /opt/elastic/src ]; then
 TEXT="Stable Setup or Experimental Setup?\n\
 \n\
 Choosing Stable Setup will run the current stable version of Setup.\n\
@@ -221,6 +222,7 @@ if [ "$SETUP" == "Experimental Setup" ]; then
 	/usr/sbin/sosetup-elastic skipnetwork
 	exit $?
 fi
+fi
 
 #########################################
 # Evaluation Mode or Production Mode

debian/changelog

@@ -1,3 +1,9 @@
+securityonion-setup (20120912-0ubuntu0securityonion240) trusty; urgency=medium
+
+  * check for sosetup-elastic and /opt/elastic/src before offering Experimental option 
+
+ -- Doug Burks <[email protected]>  Tue, 29 Aug 2017 13:24:41 -0400
+
 securityonion-setup (20120912-0ubuntu0securityonion239) trusty; urgency=medium
 
   * skip sosetup-network when passing from sosetup to sosetup-elastic 

debian/patches/check-for-sosetup-elastic-and-optelasticsrc-before-offering-Experimental-option

@@ -0,0 +1,43 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ securityonion-setup (20120912-0ubuntu0securityonion240) trusty; urgency=medium
+ .
+   * check for sosetup-elastic and /opt/elastic/src before offering Experimental option
+Author: Doug Burks <[email protected]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- securityonion-setup-20120912.orig/bin/sosetup
++++ securityonion-setup-20120912/bin/sosetup
+@@ -196,6 +196,7 @@ fi
+ #########################################
+ # Stable Setup or Experimental Setup
+ #########################################
++if [ -f /usr/sbin/sosetup-elastic ] && [ -d /opt/elastic/src ]; then
+ TEXT="Stable Setup or Experimental Setup?\n\
+ \n\
+ Choosing Stable Setup will run the current stable version of Setup.\n\
+@@ -221,6 +222,7 @@ if [ "$SETUP" == "Experimental Setup" ];
+ 	/usr/sbin/sosetup-elastic skipnetwork
+ 	exit $?
+ fi
++fi
+
+ #########################################
+ # Evaluation Mode or Production Mode

debian/patches/series

@@ -227,3 +227,4 @@ inform-user-of-OSSEC-server-restart-for-so-disallow
 so-allowdisallow:-fix-wrong-number-of-arguments-error
 update-for-elastic
 skip-sosetup-network-when-passing-from-sosetup-to-sosetup-elastic
+check-for-sosetup-elastic-and-optelasticsrc-before-offering-Experimental-option