From fa9456f6cf7842d9342ca446c03c1a05167430fd Mon Sep 17 00:00:00 2001
From: ts <thomashaw@localhost.localdomain>
Date: Mon, 18 Feb 2019 16:36:13 +0000
Subject: [PATCH] test_scenario: tmp update

---
 scenarios/tests/test_scenario.xml | 66 ++++++-------------------------
 secgen.rb                         |  4 +-
 2 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/scenarios/tests/test_scenario.xml b/scenarios/tests/test_scenario.xml
index c68efee2c..e41dccff2 100644
--- a/scenarios/tests/test_scenario.xml
+++ b/scenarios/tests/test_scenario.xml
@@ -7,68 +7,24 @@
     <system_name>testing</system_name>
     <base platform="linux" distro="Debian 7.8" type="server"/>
 
-    <!--<vulnerability module_path=".*dirtycow.*"/>-->
-    <vulnerability module_path=".*suid_root_bash.*"/>
-
     <input into_datastore="IP_addresses">
-      <value>172.16.0.14</value>
+      <value>172.17.0.0</value>
     </input>
 
-    <network type="private_network">
+    <vulnerability module_path=".*wordpress_3x.*">
+      <input into="https">
+        <value>true</value>
+      </input>
+      <input into="IP_address">
+        <datastore access="0">IP_addresses</datastore>
+      </input>
+    </vulnerability>
+
+  <network type="private_network">
       <input into="IP_address">
         <datastore access="0">IP_addresses</datastore>
       </input>
     </network>
   </system>
 
-  <!--<system>-->
-    <!--<system_name>wordpress_2x_wheezy</system_name>-->
-    <!--<base platform="linux" distro="Debian 7.8" type="server"/>-->
-
-    <!--<input into_datastore="IP_addresses">-->
-      <!--<value>172.16.0.5</value>-->
-      <!--<value>172.16.0.6</value>-->
-      <!--<value>172.16.0.7</value>-->
-    <!--</input>-->
-
-    <!--<vulnerability module_path=".*wordpress_2x.*">-->
-      <!--<input into="IP_address">-->
-        <!--<datastore access="1">IP_addresses</datastore>-->
-      <!--</input>-->
-    <!--</vulnerability>-->
-
-    <!--<network type="private_network">-->
-      <!--<input into="IP_address">-->
-        <!--<datastore access="1">IP_addresses</datastore>-->
-      <!--</input>-->
-    <!--</network>-->
-  <!--</system>-->
-
-
-  <!--<system>-->
-    <!--<system_name>wordpress_3x_stretch</system_name>-->
-    <!--<base platform="linux" distro="Debian 9" type="server"/>-->
-<!---->
-    <!--<vulnerability module_path=".*wordpress_3x.*"/>-->
-<!---->
-    <!--<network type="private_network">-->
-      <!--<input into="IP_address">-->
-        <!--<datastore access="next">IP_addresses</datastore>-->
-      <!--</input>-->
-    <!--</network>-->
-  <!--</system>-->
-
-  <!--<system>-->
-    <!--<system_name>wordpress_4x_stretch</system_name>-->
-    <!--<base platform="linux" distro="Debian 9" type="server"/>-->
-
-    <!--<vulnerability module_path=".*wordpress_4x.*"/>-->
-
-    <!--<network type="private_network">-->
-      <!--<input into="IP_address">-->
-        <!--<datastore access="next">IP_addresses</datastore>-->
-      <!--</input>-->
-    <!--</network>-->
-  <!--</system>-->
-
 </scenario>
diff --git a/secgen.rb b/secgen.rb
index 83773d7ae..0ff4ace33 100644
--- a/secgen.rb
+++ b/secgen.rb
@@ -172,11 +172,11 @@ def build_vms(scenario, project_dir, options)
           end
         else # TODO:  elsif vagrant_output[:exception].type == ProcessHelper::TimeoutError   >destroy individually broken vms as above?
           Print.err 'Vagrant up timeout, destroying VMs and retrying...'
-          GemExec.exe('vagrant', project_dir, 'destroy -f')
+          # GemExec.exe('vagrant', project_dir, 'destroy -f')
         end
       else
         Print.err 'Error provisioning VMs, destroying VMs and exiting SecGen.'
-        GemExec.exe('vagrant', project_dir, 'destroy -f')
+        # GemExec.exe('vagrant', project_dir, 'destroy -f')
         exit 1
       end
     end