From c92aa8f064085df1781916f268c3ca07b5aa8dcb Mon Sep 17 00:00:00 2001
From: thomashaw <thomashaw@gmail.com>
Date: Sat, 8 Feb 2025 14:39:09 +0000
Subject: [PATCH] team project changes 2425

---
 .../templates/security_audit_remit.md.erb     |  2 +-
 scenarios/security_audit/team_project.xml     | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/modules/generators/messages/security_audit_remit/templates/security_audit_remit.md.erb b/modules/generators/messages/security_audit_remit/templates/security_audit_remit.md.erb
index 139e8f5c3..67c7d84a6 100644
--- a/modules/generators/messages/security_audit_remit/templates/security_audit_remit.md.erb
+++ b/modules/generators/messages/security_audit_remit/templates/security_audit_remit.md.erb
@@ -13,7 +13,7 @@ Complete copies of our security policy documents are available via the Intranet
 We backup all our data (including code and documents) via <%= self.local_backup %>.  We also do a weekly backup to <%= self.remote_backup %>.
 
 ## Office location
-We have leased <%= self.business_location %> for our operations (including employees and server rooms) for the last 4 years.  The other areas of the building are used by third parties.  We have <%= self.physical_security %> to control access to our rooms.
+We have leased Room JG205 within the James Graham building on Leeds Beckett University's Headingley campus for our operations for the last 4 years.  The other areas of the building are used by third parties.  We have <%= self.physical_security %> to control access to our rooms. You will not be allowed access into the room and should not do any physical testing on the room, but should use passive observation in authorised areas to gauge the physical security of the premises.
 
 ## IT infrastructure
 Our IT team developed the servers that are currently deployed.
diff --git a/scenarios/security_audit/team_project.xml b/scenarios/security_audit/team_project.xml
index ad9a5713e..691ce3aa1 100644
--- a/scenarios/security_audit/team_project.xml
+++ b/scenarios/security_audit/team_project.xml
@@ -18,7 +18,8 @@
 
   <!-- Web Server on NIC1 and NIC2 -->
   <system>
-    <system_name>web</system_name>
+
+    <system_name>web_server</system_name>
     <base distro="Debian 12" type="desktop" name="KDE"/>
 
     <input into_datastore="IP_addresses">
@@ -29,6 +30,10 @@
       <value>172.10.0.6</value>
     </input>
 
+    <input into_datastore="spoiler_admin_pass">
+      <generator type="password_generator"/>
+    </input>
+
     <service module_path="services/unix/http/parameterised_website">
       <input into="organisation" into_datastore="organisation">
         <encoder type="line_selector">
@@ -62,7 +67,7 @@
 
     <build type="cleanup">
       <input into="root_password">
-        <generator type="password_generator"/>
+        <datastore>spoiler_admin_pass</datastore>
       </input>
     </build>
 
@@ -77,7 +82,7 @@
 
   <!-- Intranet Server on NIC 2 -->
   <system>
-    <system_name>intranet</system_name>
+    <system_name>intranet_server</system_name>
     <base distro="Debian 12" type="desktop" name="KDE"/>
 
     <!-- Web server hosting acceptable use policy and security audit remit -->
@@ -111,6 +116,9 @@
           <input into="username">
             <datastore access_json="['manager']['username']">organisation</datastore>
           </input>
+          <input into="super_user">
+            <value>true</value>
+          </input>
         </generator>
         <generator type="account">
           <input into="username">
@@ -150,7 +158,7 @@
 
     <build type="cleanup">
       <input into="root_password">
-        <generator type="password_generator"/>
+        <datastore>spoiler_admin_pass</datastore>
       </input>
     </build>
 
@@ -189,6 +197,9 @@
       <input into="accounts">
         <datastore access_json="['manager']">organisation</datastore>
       </input>
+      <input into="start_page">
+        <datastore access="1">IP_addresses</datastore>
+      </input>
     </utility>
 
     <utility module_path=".*/handy_cli_tools"/>
@@ -199,6 +210,7 @@
       </input>
     </network>
     <!--<network module_path=".*/private_network_2"/>-->
+
   </system>
 
   <system>