From 37d72398037c5ff0c19a0b61046e244633206ee0 Mon Sep 17 00:00:00 2001 From: michaa76 Date: Wed, 16 Dec 2015 14:25:23 +0100 Subject: [PATCH] #6674 CFEngine Provisioner Broken on Debian (http > https) --- .../provisioners/cfengine/cap/debian/cfengine_install.rb | 4 +++- plugins/provisioners/cfengine/config.rb | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/provisioners/cfengine/cap/debian/cfengine_install.rb b/plugins/provisioners/cfengine/cap/debian/cfengine_install.rb index 57c235654..8d82d5b12 100644 --- a/plugins/provisioners/cfengine/cap/debian/cfengine_install.rb +++ b/plugins/provisioners/cfengine/cap/debian/cfengine_install.rb @@ -7,7 +7,9 @@ module VagrantPlugins machine.communicate.tap do |comm| comm.sudo("mkdir -p #{File.dirname(config.deb_repo_file)} && /bin/echo #{config.deb_repo_line} > #{config.deb_repo_file}") comm.sudo("GPGFILE=`tempfile`; wget -O $GPGFILE #{config.repo_gpg_key_url} && apt-key add $GPGFILE; rm -f $GPGFILE") - + + comm.sudo("apt-get install -y --force-yes apt-transport-https"); + comm.sudo("apt-get update") comm.sudo("apt-get install -y #{config.package_name}") end diff --git a/plugins/provisioners/cfengine/config.rb b/plugins/provisioners/cfengine/config.rb index 19d0e7583..5d2ebbef9 100644 --- a/plugins/provisioners/cfengine/config.rb +++ b/plugins/provisioners/cfengine/config.rb @@ -51,7 +51,7 @@ module VagrantPlugins end if @deb_repo_line == UNSET_VALUE - @deb_repo_line = "deb http://cfengine.com/pub/apt/packages stable main" + @deb_repo_line = "deb https://cfengine.com/pub/apt/packages stable main" end @extra_agent_args = nil if @extra_agent_args == UNSET_VALUE @@ -71,7 +71,7 @@ module VagrantPlugins @policy_server_address = nil if @policy_server_address == UNSET_VALUE if @repo_gpg_key_url == UNSET_VALUE - @repo_gpg_key_url = "http://cfengine.com/pub/gpg.key" + @repo_gpg_key_url = "https://cfengine.com/pub/gpg.key" end @upload_path = "/tmp/vagrant-cfengine-file" if @upload_path == UNSET_VALUE @@ -81,7 +81,7 @@ module VagrantPlugins end if @yum_repo_url == UNSET_VALUE - @yum_repo_url = "http://cfengine.com/pub/yum/$basearch" + @yum_repo_url = "https://cfengine.com/pub/yum/$basearch" end if @package_name == UNSET_VALUE