From a6a85d44d4a3adeef8a9178a34b16da39aab5290 Mon Sep 17 00:00:00 2001
From: "Z. Cliffe Schreuders" <code.cliffe@schreuders.org>
Date: Thu, 18 Jan 2024 12:59:43 +0000
Subject: [PATCH] lab scenario update

---
 scenarios/labs/systems_security/3_ss_conf.xml | 51 ++++++++-----------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/scenarios/labs/systems_security/3_ss_conf.xml b/scenarios/labs/systems_security/3_ss_conf.xml
index 63829195b..34d5eb9c4 100644
--- a/scenarios/labs/systems_security/3_ss_conf.xml
+++ b/scenarios/labs/systems_security/3_ss_conf.xml
@@ -17,19 +17,12 @@
     <base distro="Debian 10" type="desktop" name="KDE"/>
 
     <input into_datastore="IP_addresses">
-      <!-- 0 developer_desktop -->
       <value>172.16.0.2</value>
-      <!-- 1 server -->
       <value>172.16.0.3</value>
-      <!-- 2 hackerbot_server -->
       <value>172.16.0.4</value>
-      <!-- 3 staff_desktop -->
       <value>172.16.0.5</value>
-      <!-- 4 auth_server -->
       <value>172.16.0.6</value>
-      <!-- 5 windows_2016_dc -->
       <value>172.16.0.7</value>
-      <!-- 6 win7_desktop -->
       <value>172.16.0.8</value>
     </input>
 
@@ -193,28 +186,6 @@
       </input>
     </utility>
 
-    <system>
-      <system_name>win7_desktop</system_name>
-      <base platform="windows" distro="7"/>
-
-      <utility module_path=".*/parameterised_accounts" platform="windows">
-        <input into="accounts">
-          <datastore>user_accounts</datastore>
-        </input>
-      </utility>
-
-      <network type="private_network">
-        <input into="IP_address">
-          <datastore access="2">IP_addresses</datastore>
-        </input>
-      </network>
-    <build type="cleanup">
-      <input into="root_password">
-        <datastore>spoiler_admin_pass</datastore>
-      </input>
-    </build>
-    </system>
-
     <vulnerability module_path=".*/ssh_root_login">
       <input into="root_password">
         <datastore>spoiler_admin_pass</datastore>
@@ -283,4 +254,26 @@
     </build>
   </system>
 
+  <system>
+    <system_name>win7_desktop</system_name>
+    <base platform="windows" distro="7"/>
+
+    <utility module_path=".*/parameterised_accounts" platform="windows">
+      <input into="accounts">
+        <datastore>user_accounts</datastore>
+      </input>
+    </utility>
+
+    <network type="private_network">
+      <input into="IP_address">
+        <datastore access="2">IP_addresses</datastore>
+      </input>
+    </network>
+  <build type="cleanup">
+    <input into="root_password">
+      <datastore>spoiler_admin_pass</datastore>
+    </input>
+  </build>
+</system>
+
 </scenario>