From 3069dee9b026bb1814bd0a422fb2e764bdff92af Mon Sep 17 00:00:00 2001
From: secgen server <secgen@secgenserver.com>
Date: Wed, 21 Mar 2018 20:23:26 +0000
Subject: [PATCH] secgen_server push

---
 lib/templates/Vagrantfile.erb                  |  2 +-
 .../debian_stretch_puppet/secgen_metadata.xml  |  2 +-
 .../puppet_module/wordpress/manifests/conf.pp  | 12 ++++++------
 scenarios/test_scenario.xml                    | 18 ++++++++++++++----
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/lib/templates/Vagrantfile.erb b/lib/templates/Vagrantfile.erb
index 2775eceff..02ab87523 100644
--- a/lib/templates/Vagrantfile.erb
+++ b/lib/templates/Vagrantfile.erb
@@ -137,7 +137,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   <%       end %>
 <%     else -%>
   <%       if (@options.has_key? :ovirtuser) && (@options.has_key? :ovirtpass) %>
-  <%         if @ovirt_template and @ovirt_template.include? 'kali_linux_msf' %>
+  <%         if @ovirt_template and (@ovirt_template.include? 'kali_linux_msf' or @ovirt_template.include? 'debian_stretch_server_n') %>
       <%= system.name %>.vm.provision 'shell', inline: "echo \"auto lo\niface lo inet loopback\n\nauto eth0\niface eth0 inet static\n\taddress <%= resolve_network(selected_module)%>\" > /etc/network/interfaces"
       <%= system.name %>.vm.provision 'shell', inline: "echo '' > /etc/environment"
   <%         elsif @ovirt_template and @ovirt_template.include? 'debian_desktop_kde' %>
diff --git a/modules/bases/debian_stretch_puppet/secgen_metadata.xml b/modules/bases/debian_stretch_puppet/secgen_metadata.xml
index bc837a9d0..5c852ff33 100644
--- a/modules/bases/debian_stretch_puppet/secgen_metadata.xml
+++ b/modules/bases/debian_stretch_puppet/secgen_metadata.xml
@@ -15,7 +15,7 @@
   <platform>unix</platform>
   <distro>Debian 9 (stretch) TODO: 32-bit (i386)</distro>
   <url>https://app.vagrantup.com/summernguyen/boxes/debian-stretch-puppet/versions/1.0.0/providers/virtualbox.box</url>
-  <ovirt_template>debian_stretch_server</ovirt_template>
+  <ovirt_template>debian_stretch_server_n</ovirt_template>
 
   <reference>https://atlas.hashicorp.com/puppetlabs</reference>
   <software_license>various</software_license>
diff --git a/modules/utilities/unix/puppet_module/wordpress/manifests/conf.pp b/modules/utilities/unix/puppet_module/wordpress/manifests/conf.pp
index 76f6dd181..9c0c160d3 100644
--- a/modules/utilities/unix/puppet_module/wordpress/manifests/conf.pp
+++ b/modules/utilities/unix/puppet_module/wordpress/manifests/conf.pp
@@ -1,5 +1,5 @@
 class wordpress::conf ($version){
-  file { '/tmp/wordpress_conf.sh':
+  file { '/wordpress_conf.sh':
     owner   => 'root',
     group   => 'root',
     ensure  => present,
@@ -7,8 +7,8 @@ class wordpress::conf ($version){
     content => template('wordpress/wordpress_conf.sh.erb'),
   }
 
-  exec { 'run wordpress config script':
-    command => '/bin/bash /tmp/wordpress_conf.sh',
-    require => File['/tmp/wordpress_conf.sh'],
-  }
-}
\ No newline at end of file
+#  exec { 'run wordpress config script':
+#    command => '/bin/bash /tmp/wordpress_conf.sh',
+#    require => File['/tmp/wordpress_conf.sh'],
+#  }
+}
diff --git a/scenarios/test_scenario.xml b/scenarios/test_scenario.xml
index a2ba212f3..cac0b5400 100644
--- a/scenarios/test_scenario.xml
+++ b/scenarios/test_scenario.xml
@@ -7,11 +7,21 @@
 	<!-- an example remote storage system, with a remotely exploitable vulnerability that can then be escalated to root -->
 	<system>
 		<system_name>apache_https</system_name>
-		<base platform="linux" type="server" />
+		<base platform="linux" type="server" module_path=".*stretch.*"/>
+		<input into_datastore="IP_addresses">
+			<value>172.16.0.2</value>
+		</input>
 
-		<vulnerability module_path=".*gitlist_040.*" />
-
-		<network type="private_network" range="172.16.0.0"/>
+		<vulnerability module_path=".*wordpress.*" >
+			<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>
 
 </scenario>