haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6675 from michaa76/master 

#6674 CFEngine Provisioner Broken on Debian (http > https)
This commit is contained in:
Mitchell Hashimoto 2015-12-16 10:46:21 -08:00
parent ddbd2a4cfc 37d7239803
commit 811f21938a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/provisioners/cfengine/cap/debian/cfengine_install.rb
View File

@ -7,7 +7,9 @@ module VagrantPlugins
machine.communicate.tap do |comm| 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("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("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 update")
comm.sudo("apt-get install -y #{config.package_name}") comm.sudo("apt-get install -y #{config.package_name}")
end end

6
plugins/provisioners/cfengine/config.rb
View File

@ -51,7 +51,7 @@ module VagrantPlugins
end end
if @deb_repo_line == UNSET_VALUE 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 end
@extra_agent_args = nil if @extra_agent_args == UNSET_VALUE @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 @policy_server_address = nil if @policy_server_address == UNSET_VALUE
if @repo_gpg_key_url == 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 end
@upload_path = "/tmp/vagrant-cfengine-file" if @upload_path == UNSET_VALUE @upload_path = "/tmp/vagrant-cfengine-file" if @upload_path == UNSET_VALUE
@ -81,7 +81,7 @@ module VagrantPlugins
end end
if @yum_repo_url == UNSET_VALUE 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 end
if @package_name == UNSET_VALUE if @package_name == UNSET_VALUE