vagrant-ca-certificates 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6bb5a84f031146833700dd4a0134e5f59190238
-  data.tar.gz: 6c60e7e1ce00d468b6b37d5d5cc4c7ce7d4e132d
+  metadata.gz: 8784848a5643a4e349cab6d9b221cbdef4e04876
+  data.tar.gz: fc760febe565f144ee67a9b5aed2549779bab109
 SHA512:
-  metadata.gz: 926f8fa00f08d77e5d52d6bed80fd39ebf85488ff50b3d52f2c286a7ef36ed32223fa8f19f5054a1f8a2fde70ce58a5bb19ceeb59f4551b2d176c723d772dc6a
-  data.tar.gz: 5e34b56b1ccfbedb53afbb7f0e6242f889b69e9f6327cd8879dd74ffd7a9dc639ea7134c6956d8b043115d280bc410efd10aaf58808d7c04caca7f90376b7fc9
+  metadata.gz: eee07d1e8ba330c545090cc2d0b50297a4b93386fcf0e6ce99ffbd57ec52c2c46f48a8a04105279ae6b50259e71b8bae088a9fc6a7397ad92013a1d57ee3a917
+  data.tar.gz: acbb68a3f36f9384c4d09302f592c7ae163ac0f3f5145cd67495dadd64158af004ba5e128b61fc09aca3241708c8e48c3c33f04d12d60cf32587a4908e3cd807

data/lib/vagrant-ca-certificates/action/install_certificates.rb

@@ -55,18 +55,18 @@ module VagrantPlugins
 
         def upload_certificate(from, to)
           @logger.debug("Uploading certificates #{from} -> #{to}")
-          remote = Tempfile.new('vagrant-ca-certificates')
           if from =~ /^http[s]?/
+            remote = Tempfile.new('vagrant-ca-certificates')
             Vagrant::Util::Downloader.new(from, remote.path).download!
             from = remote.path
           end
 
           @machine.communicate.tap do |sh|
             unless certificate_matches?(from, to)
-              remote = Tempfile.new('vagrant')
+              tmp_to = Pathname.new(Tempfile.new('vagrant').path).basename
               @machine.ui.info(I18n.t('vagrant_ca_certificates.certificate.upload.file', from: from, to: to))
-              sh.upload(from, remote.path)
-              sh.sudo("mv #{remote.path} #{to} && chown root: #{to} && chmod 0644 #{to}")
+              sh.upload(from, tmp_to) # remote.path will build a "C:\" URI on windows, cp to ~ and move
+              sh.sudo("mv #{tmp_to} #{to} && chown root: #{to} && chmod 0644 #{to}")
             end
           end
         end

data/lib/vagrant-ca-certificates/cap/debian/update_certificate_bundle.rb

@@ -5,6 +5,7 @@ module VagrantPlugins
         # Capability for configuring the certificate bundle on Debian.
         module UpdateCertificateBundle
           def self.update_certificate_bundle(m)
+            m.communicate.sudo("ls /usr/share/ca-certificates/private | awk '{print \"private/\"$1;}' >> /etc/ca-certificates.conf") # enable our custom certs
             m.communicate.sudo('update-ca-certificates') do |type, data|
               if [:stderr, :stdout].include?(type)
                 next if data =~ /stdin: is not a tty/

data/lib/vagrant-ca-certificates/cap/redhat/helpers.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
         # bundles must be managed manually.
         def self.legacy_certificate_bundle?(sh)
           command = %q(R=$(sed -E "s/.* ([0-9])\.([0-9]+) .*/\\1.\\2/" /etc/redhat-release))
-          sh.test(%Q(#{command} && [[ $R =~ ^5 || $R =~ ^6\.[0-4]+ ]]), shell: '/bin/bash')
+          sh.test(%Q(#{command} && [[ $R =~ ^5 || $R =~ ^6\.[0-4]+ ]]), shell: '/bin/bash') || !sh.test("rpm -q --verify --nomtime ca-certificates", shell:'/bin/bash')
         end
       end
     end

data/lib/vagrant-ca-certificates/cap/redhat/update_certificate_bundle.rb

@@ -11,11 +11,13 @@ module VagrantPlugins
               if Redhat.legacy_certificate_bundle?(sh)
                 sh.sudo('find /etc/pki/tls/private -type f -exec cat {} \; | cat /etc/pki/tls/certs/ca-bundle.crt - > /etc/pki/tls/ca.private.crt')
                 sh.sudo('/bin/ln -fsn /etc/pki/tls/ca.private.crt /etc/pki/tls/cert.pem')
+                sh.sudo('/bin/ln -fsn /etc/pki/tls/ca.private.crt /etc/pki/tls/certs/ca-bundle.crt')
                 sh.execute(<<-SCRIPT, shell: '/bin/bash', sudo: true)
-[ ! -z "$JAVA_HOME" ] && \
+if [ ! -z "$JAVA_HOME" ]; then \
 find /etc/pki/tls/private -type f -exec $JAVA_HOME/bin/keytool -importcert \
  -trustcacerts -noprompt -storepass changeit \
- -keystore $JAVA_HOME/jre/lib/security/cacerts -file {} \\;
+ -keystore $JAVA_HOME/jre/lib/security/cacerts -file {} \\; \
+else true; fi
                 SCRIPT
               else
                 sh.sudo('update-ca-trust enable')

data/lib/vagrant-ca-certificates/plugin.rb

@@ -22,11 +22,6 @@ module VagrantPlugins
         hook.after(Vagrant::Action::Builtin::Provision, Action::InstallCertificates)
       end
 
-      action_hook(:install_ca_certificates) do |hook|
-        require_relative 'action/install_certificates'
-        hook.after(:run_provisioner, Action::InstallCertificates)
-      end
-
       # All supported guest systems must have these capabilities
       # implemented. If any of them aren't config validate will fail.
       guest_capability('debian', 'update_certificate_bundle') do

data/lib/vagrant-ca-certificates/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module CaCertificates
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ca-certificates
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - William Bailey
@@ -31,7 +31,7 @@ cert_chain:
   cKcRBHKYVo5pQ0zs2WJv6Qwa8KhCS5HlABy/3x2Mqt6reHGppi7nVC4nUt/B1y/9
   e2Nj035zG32VLvxrvP4OKOJJlV2dnn0CyZeQYgpZ5+d1C/lz
   -----END CERTIFICATE-----
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler