From c339d0431070885b6ce6c1ea866c1c28f7cf3eca Mon Sep 17 00:00:00 2001
From: "Z. Cliffe Schreuders" <code.cliffe@schreuders.org>
Date: Thu, 18 Jan 2024 12:59:23 +0000
Subject: [PATCH] Fix file paths and add systemd provider for webgoat and
 webwolf services for new puppet version

---
 .../web_training/security_shepherd/manifests/mariadb.pp    | 5 ++++-
 .../unix/web_training/webgoat/manifests/install.pp         | 2 +-
 .../unix/web_training/webgoat/manifests/service.pp         | 7 ++++---
 .../unix/web_training/webwolf/manifests/install.pp         | 2 +-
 .../unix/web_training/webwolf/manifests/service.pp         | 7 ++++---
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/modules/vulnerabilities/unix/web_training/security_shepherd/manifests/mariadb.pp b/modules/vulnerabilities/unix/web_training/security_shepherd/manifests/mariadb.pp
index aa8acaf43..d26ae9b6a 100644
--- a/modules/vulnerabilities/unix/web_training/security_shepherd/manifests/mariadb.pp
+++ b/modules/vulnerabilities/unix/web_training/security_shepherd/manifests/mariadb.pp
@@ -37,7 +37,10 @@ class security_shepherd::mariadb {
     command => "mysql -u ${user} -p${db_pass} < moduleSchemas.sql",
   }
 
-  file { '/var/lib/tomcat9/webapps/ROOT/WEB-INF/classes/flags':
+  file { ['/var/lib/tomcat9/webapps/ROOT', '/var/lib/tomcat9/webapps/ROOT/WEB-INF', '/var/lib/tomcat9/webapps/ROOT/WEB-INF/classes', '/var/lib/tomcat9/webapps/ROOT/WEB-INF/classes/flag-store']:
+    ensure  => directory,
+  }
+  -> file { '/var/lib/tomcat9/webapps/ROOT/WEB-INF/classes/flags':
     ensure  => file,
     content => template('security_shepherd/flags.erb'),
   }
diff --git a/modules/vulnerabilities/unix/web_training/webgoat/manifests/install.pp b/modules/vulnerabilities/unix/web_training/webgoat/manifests/install.pp
index 44af0d87f..3501e1c44 100644
--- a/modules/vulnerabilities/unix/web_training/webgoat/manifests/install.pp
+++ b/modules/vulnerabilities/unix/web_training/webgoat/manifests/install.pp
@@ -22,7 +22,7 @@ class webgoat::install {
     source => 'puppet:///modules/webgoat/webgoat-server-8.0.0.M26.jar',
   } ->
 
-  file { "$docroot/webgoat.service":
+  file { "/etc/systemd/system/webgoat.service":
     ensure  => present,
     mode   => '0644',
     owner => 'root',
diff --git a/modules/vulnerabilities/unix/web_training/webgoat/manifests/service.pp b/modules/vulnerabilities/unix/web_training/webgoat/manifests/service.pp
index 8cc1ac710..f491b1ea8 100644
--- a/modules/vulnerabilities/unix/web_training/webgoat/manifests/service.pp
+++ b/modules/vulnerabilities/unix/web_training/webgoat/manifests/service.pp
@@ -1,11 +1,12 @@
 class webgoat::service{
 
-  file { '/etc/systemd/system/webgoat.service':
-    ensure => 'link',
-    target => '/opt/webgoat/webgoat.service',
+  exec { 'systemctl-daemon-reload':
+    command => '/bin/systemctl daemon-reload',
+    path    => '/bin:/usr/bin',
   }->
   service { 'webgoat':
     ensure   => running,
     enable   => true,
+    provider => 'systemd',
   }
 }
diff --git a/modules/vulnerabilities/unix/web_training/webwolf/manifests/install.pp b/modules/vulnerabilities/unix/web_training/webwolf/manifests/install.pp
index dd1faa891..48fe16fb7 100644
--- a/modules/vulnerabilities/unix/web_training/webwolf/manifests/install.pp
+++ b/modules/vulnerabilities/unix/web_training/webwolf/manifests/install.pp
@@ -22,7 +22,7 @@ class webwolf::install {
     source => 'puppet:///modules/webwolf/webwolf-8.0.0.M26.jar',
   } ->
 
-  file { "$docroot/webwolf.service":
+  file { "/etc/systemd/system/webwolf.service":
     ensure  => present,
     mode   => '0644',
     owner => 'root',
diff --git a/modules/vulnerabilities/unix/web_training/webwolf/manifests/service.pp b/modules/vulnerabilities/unix/web_training/webwolf/manifests/service.pp
index e250ee116..daa34bdeb 100644
--- a/modules/vulnerabilities/unix/web_training/webwolf/manifests/service.pp
+++ b/modules/vulnerabilities/unix/web_training/webwolf/manifests/service.pp
@@ -1,11 +1,12 @@
 class webwolf::service{
 
-  file { '/etc/systemd/system/webwolf.service':
-    ensure => 'link',
-    target => '/opt/webwolf/webwolf.service',
+  exec { 'systemctl-daemon-reload':
+    command => '/bin/systemctl daemon-reload',
+    path    => '/bin:/usr/bin',
   }->
   service { 'webwolf':
     ensure   => running,
     enable   => true,
+    provider => 'systemd',
   }
 }