Skip to content

Commit

Permalink
Fixes #325, #318 - don't download cacert.pem
Browse files Browse the repository at this point in the history
This addresses both concerns of #318 and #325. We were downloading the
SSL CA bundle over http because at the point in time when we wanted to
even do that we might not have been in a state where the SSL
certificates from curl.haxx.se could be verified. Using http is just
as good at that point as using SSL without verification. However...

This addresses the concern raised in #325, whereby the upstream
cacert.pem removed certificates used by services such as AWS S3,
causing SSL connections to those sites to fail to verify. We should
rely on the ca-bundle.crt that comes with the openssl package on the
platforms in question (centos/fedora).
  • Loading branch information
jtimberman committed Feb 24, 2015
1 parent ec4b3cd commit 0854e2c
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 12 deletions.
2 changes: 0 additions & 2 deletions packer/http/centos-5.11/ks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ yum
-zd1211-firmware

%post
# update root certs
wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem
# sudo
echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
2 changes: 0 additions & 2 deletions packer/http/centos-6.6/ks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ nfs-utils
%post
# Force to set SELinux to a permissive mode
sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config
# update root certs
wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem
# sudo
echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
2 changes: 0 additions & 2 deletions packer/http/centos-7.0/ks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ bzip2
%end

%post
# update root certs
wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem
# sudo
echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
Expand Down
2 changes: 0 additions & 2 deletions packer/http/fedora-20/ks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ net-tools
%end

%post
# update root certs
wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem
# sudo
echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant
echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant
Expand Down
2 changes: 0 additions & 2 deletions packer/http/fedora-21/ks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ net-tools
%end

%post
# update root certs
wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem
# sudo
echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant
echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant
Expand Down
2 changes: 0 additions & 2 deletions packer/scripts/fedora/ks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ nfs-utils
%end

%post
# update root certs
wget -O /etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem
# vagrant
groupadd vagrant
useradd vagrant -g vagrant -G wheel -u 900
Expand Down

0 comments on commit 0854e2c

Please sign in to comment.