From d57cdf58a0e3291d289c64947646069222ebe09d Mon Sep 17 00:00:00 2001 From: JD Date: Fri, 14 Jul 2023 16:56:04 +0100 Subject: [PATCH] use stdlib ensure_packages --- .../security_shepherd/manifests/install.pp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/vulnerabilities/unix/web_training/security_shepherd/manifests/install.pp b/modules/vulnerabilities/unix/web_training/security_shepherd/manifests/install.pp index d16bb4682..3909c63c5 100644 --- a/modules/vulnerabilities/unix/web_training/security_shepherd/manifests/install.pp +++ b/modules/vulnerabilities/unix/web_training/security_shepherd/manifests/install.pp @@ -1,18 +1,9 @@ # Installer process class security_shepherd::install { + include stdlib Exec { path => ['/bin', '/usr/bin', '/usr/local/bin', '/sbin', '/usr/sbin'] } - package { 'install-tomcat': - ensure => installed, - name => 'tomcat9', - } - -> package { 'install-mariadb': - ensure => installed, - name => 'mariadb-server', - } -> package { 'install-jdk11': - ensure => installed, - name => 'openjdk-11-jdk', - } + ensure_packages(['tomcat9', 'mariadb-server', 'openjdk-11-jdk'], {ensure => installed}) exec { 'remove-default-site': command => 'rm -rf /var/lib/tomcat9/webapps/*',