Merge pull request #173 from syseleven/fix/proper_vcs_installation

Upgrade vcs version to 0.30.2

Author: Dan33l

manifests/params.pp

@@ -9,7 +9,7 @@
   $venv_path           = '/opt/letsencrypt/.venv' # virtualenv path for vcs-installed letsencrypt
   $repo                = 'https://github.com/certbot/certbot.git'
   $cron_scripts_path   = "${facts['puppet_vardir']}/letsencrypt" # path for renewal scripts called by cron
-  $version             = 'v0.30.0'
+  $version             = 'v0.30.2'
   $config              = {
     'server' => 'https://acme-v01.api.letsencrypt.org/directory',
   }

spec/acceptance/letsencrypt_spec.rb

@@ -27,4 +27,39 @@ class { 'letsencrypt' :
       its(:content) { is_expected.to match %r{email = [email protected]} }
     end
   end
+
+  context 'with install_method => vcs' do
+    pp = %(
+      class { 'letsencrypt' :
+        install_method => 'vcs',
+        email          => '[email protected]',
+        config         => {
+          'server' => 'https://acme-staging.api.letsencrypt.org/directory',
+        },
+      }
+    )
+
+    it 'installs letsencrypt without error' do
+      apply_manifest(pp, catch_failures: true)
+    end
+    it 'installs letsencrypt idempotently' do
+      apply_manifest(pp, catch_changes: true)
+    end
+
+    describe file('/etc/letsencrypt/cli.ini') do
+      it { is_expected.to be_file }
+      it { is_expected.to be_owned_by 'root' }
+      it { is_expected.to be_grouped_into 'root' }
+      it { is_expected.to be_mode 644 }
+      its(:content) { is_expected.to match %r{server = https://acme-staging.api.letsencrypt.org/directory} }
+      its(:content) { is_expected.to match %r{email = [email protected]} }
+    end
+
+    describe file('/opt/letsencrypt/.venv/bin/letsencrypt') do
+      it { is_expected.to be_file }
+      it { is_expected.to be_owned_by 'root' }
+      it { is_expected.to be_grouped_into 'root' }
+      it { is_expected.to be_mode 755 }
+    end
+  end
 end

spec/classes/letsencrypt_install_spec.rb

@@ -11,7 +11,7 @@
         manage_dependencies: true,
         path: '/opt/letsencrypt',
         repo: 'https://github.com/certbot/certbot.git',
-        version: 'v0.30.0',
+        version: 'v0.30.2',
         package_name: 'letsencrypt'
       }
     end
@@ -64,7 +64,7 @@
 
         it 'contains the correct resources' do
           is_expected.to contain_vcsrepo('/opt/letsencrypt').with(source: 'https://github.com/certbot/certbot.git',
-                                                                  revision: 'v0.30.0')
+                                                                  revision: 'v0.30.2')
           is_expected.to contain_package('python')
           is_expected.to contain_package('git')
 

spec/classes/letsencrypt_spec.rb

@@ -31,7 +31,7 @@
                                                                       manage_install: true,
                                                                       manage_dependencies: true,
                                                                       repo: 'https://github.com/certbot/certbot.git',
-                                                                      version: 'v0.30.0').that_notifies('Exec[initialize letsencrypt]')
+                                                                      version: 'v0.30.2').that_notifies('Exec[initialize letsencrypt]')
             is_expected.to contain_exec('initialize letsencrypt')
             is_expected.to contain_class('letsencrypt::config').that_comes_before('Exec[initialize letsencrypt]')