Merge pull request #328 from chef/jtimberman/use-default-ca-bundle

Fixes #325, #318 - don't download cacert.pem
chef · Feb 24, 2015 · 8f09552 · 8f09552
2 parents ec4b3cd + 0854e2c
commit 8f09552
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 12 deletions.
diff --git a/packer/http/centos-5.11/ks.cfg b/packer/http/centos-5.11/ks.cfg
@@ -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
diff --git a/packer/http/centos-6.6/ks.cfg b/packer/http/centos-6.6/ks.cfg
@@ -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
diff --git a/packer/http/centos-7.0/ks.cfg b/packer/http/centos-7.0/ks.cfg
@@ -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

diff --git a/packer/http/fedora-20/ks.cfg b/packer/http/fedora-20/ks.cfg
@@ -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

diff --git a/packer/http/fedora-21/ks.cfg b/packer/http/fedora-21/ks.cfg
@@ -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

diff --git a/packer/scripts/fedora/ks.cfg b/packer/scripts/fedora/ks.cfg
@@ -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