From d7e9fd5db7bbeceaa4fdfacc96dce701ffc85212 Mon Sep 17 00:00:00 2001
From: thomashaw <thomashaw@gmail.com>
Date: Wed, 21 Mar 2018 22:05:55 +0000
Subject: [PATCH] WiP: vagrantfile fix, wordpress script, init.pp

---
 lib/templates/Vagrantfile.erb                          |  2 +-
 .../wordpress/templates/wordpress_conf.sh.erb          | 10 +++++++---
 .../unix/webapp/wordpress_4x/manifests/init.pp         |  6 ++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/templates/Vagrantfile.erb b/lib/templates/Vagrantfile.erb
index 05532adc8..53f23e76a 100644
--- a/lib/templates/Vagrantfile.erb
+++ b/lib/templates/Vagrantfile.erb
@@ -144,7 +144,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       <%= system.name %>.vm.provision 'shell', inline: "echo \"\nauto eth1\niface eth1 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_stretch_server_n' %>
-      <%= system.name %>.vm.provision 'shell', inline: "echo \"\nauto ens5\niface ens5 inet static\n\taddress <%= resolve_network(selected_module)%>\" >> /etc/network/interfaces" %>
+      <%= system.name %>.vm.provision 'shell', inline: "echo \"\nauto ens4\niface ens4 inet static\n\taddress <%= resolve_network(selected_module)%>\" >> /etc/network/interfaces"
   <%         else %>
       <%= system.name %>.vm.network :<%= selected_module.attributes['type'].first %>, :ovirt__ip => "<%= resolve_network(selected_module)%>", :ovirt__network_name => '<%= "#{@options[:ovirtnetwork]}" %>'
   <%         end %>
diff --git a/modules/utilities/unix/puppet_module/wordpress/templates/wordpress_conf.sh.erb b/modules/utilities/unix/puppet_module/wordpress/templates/wordpress_conf.sh.erb
index 295d42da1..4427233d8 100644
--- a/modules/utilities/unix/puppet_module/wordpress/templates/wordpress_conf.sh.erb
+++ b/modules/utilities/unix/puppet_module/wordpress/templates/wordpress_conf.sh.erb
@@ -20,6 +20,10 @@
     $params += '&language='
   end
 -%>
-curl -L <%= @https ? '-k ': '' %><%= $url_base %>
-sleep 10
-curl -L --data '<%= $params %>' <%= @https ? '-k ': '' %><%= $url_base %>/wp-admin/install.php?step=2
\ No newline at end of file
+if [ ! -f /wps ]; then
+  curl -L <%= @https ? '-k ': '' %><%= $url_base %>
+  sleep 10
+  curl -L --data '<%= $params %>' <%= @https ? '-k ': '' %><%= $url_base %>/wp-admin/install.php?step=2
+  sleep 10
+  touch /wps
+fi
\ No newline at end of file
diff --git a/modules/vulnerabilities/unix/webapp/wordpress_4x/manifests/init.pp b/modules/vulnerabilities/unix/webapp/wordpress_4x/manifests/init.pp
index 630d56ff7..fcdfdfeb9 100644
--- a/modules/vulnerabilities/unix/webapp/wordpress_4x/manifests/init.pp
+++ b/modules/vulnerabilities/unix/webapp/wordpress_4x/manifests/init.pp
@@ -43,6 +43,12 @@ class wordpress_4x {
     mode    => '0755',
     content => template('wordpress/wordpress_conf.sh.erb'),
   }
+  ~>
+  cron { 'run wordpress config script':
+    command => '/bin/bash /wordpress_conf.sh',
+    user => 'root',
+    special => reboot,
+  }
   # ~>
   # exec { 'run wordpress config script':
   #   command => '/bin/bash /tmp/wordpress_conf.sh',