From c6341c9b559bfa25655f59388f49beeece23bb49 Mon Sep 17 00:00:00 2001 From: "christopher.lawrence" Date: Thu, 13 Feb 2020 12:05:41 +0000 Subject: [PATCH] fixed password issues with windows server vagrant VM and updated manifest files --- .../manifests/custom_windows/config_server.pp | 2 +- .../manifests/custom_windows/install_package.pp | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/site-modules/profile/manifests/custom_windows/config_server.pp b/site-modules/profile/manifests/custom_windows/config_server.pp index 28d86ed..6127dcb 100644 --- a/site-modules/profile/manifests/custom_windows/config_server.pp +++ b/site-modules/profile/manifests/custom_windows/config_server.pp @@ -4,7 +4,7 @@ class profile::custom_windows::config_server ( $user_group = 'mygroup', $user_groups = ['BUILTIN\Administrators', 'BUILTIN\Users'], $user_home = "C:/Users/myuser", - $user_password = 'puppet', + $user_password = 'Puppetlabs01!', $ensure = 'present', $manage_home = true, $user_dir = 'mydir', diff --git a/site-modules/profile/manifests/custom_windows/install_package.pp b/site-modules/profile/manifests/custom_windows/install_package.pp index 8bf45ac..288462a 100644 --- a/site-modules/profile/manifests/custom_windows/install_package.pp +++ b/site-modules/profile/manifests/custom_windows/install_package.pp @@ -26,8 +26,13 @@ class profile::custom_windows::install_package ( } package { 'unzip': - ensure => '6.0', - provider => $package_provider, + ensure => '6.0', + provider => $package_provider, + } + + package { 'vim': + ensure => '8.2.0246', + provider => $package_provider, } class { 'staging': @@ -40,9 +45,9 @@ class profile::custom_windows::install_package ( staging::extract { 'master.zip': target => "${install_dir}/downloads", - #unless => '7z', unless => 'cmd.exe /c type C:\tmp\7zip', require => Staging::File['master.zip'], + notify => Exec['7z1900-x64'], } exec { '7z1900-x64': @@ -50,7 +55,7 @@ class profile::custom_windows::install_package ( command => 'cmd.exe /c C:\Users\myuser\Downloads\7z1900-x64.exe', path => $::path, unless => 'cmd.exe /c type C:\tmp\7zip', - require => Staging::Extract['master.zip'], +# unless => '7z', } file { 'C:/tmp/7zip':