From db4c35b3376ef3aee0941691d243be2db946d838 Mon Sep 17 00:00:00 2001 From: "Z. Cliffe Schreuders" Date: Wed, 2 Aug 2023 01:39:56 +0100 Subject: [PATCH] fix windows rsync of modules --- lib/templates/Vagrantfile.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/templates/Vagrantfile.erb b/lib/templates/Vagrantfile.erb index ae9a34f43..4c24bf583 100644 --- a/lib/templates/Vagrantfile.erb +++ b/lib/templates/Vagrantfile.erb @@ -304,13 +304,13 @@ when "proxmox" # nothing } <% end -%> <%=module_name%>.module_path = "<%="puppet/#{system.name}/modules"%>" - <% if selected_module.attributes['platform'].first.downcase == 'windows' %> - <%=module_name%>.temp_dir = "/cygdrive/c/vagrant/" - <% else %> - <%=module_name%>.environment_path = "environments/" - <%=module_name%>.environment_variables = {'RUBYOPT' => '-W0'} - <%=module_name%>.environment = "production" - <% end %> +<% if selected_module.attributes['platform'].first.downcase == 'windows' || @base_template =~ /win/i %> + <%=module_name%>.temp_dir = "/cygdrive/c/vagrant/" +<% else -%> + <%=module_name%>.environment_path = "environments/" + <%=module_name%>.environment_variables = {'RUBYOPT' => '-W0'} + <%=module_name%>.environment = "production" +<% end -%> <%=module_name%>.synced_folder_type = "rsync" <%=module_name%>.manifests_path = "<%="puppet/#{system.name}/modules/#{selected_module.module_path_end}"%>" <%=module_name%>.manifest_file = "<%="#{selected_module.module_path_end}.pp"%>"