Merge pull request #275 from nod0n/scripts

move scripts into a separate class

Author: bastelfreak

REFERENCE.md

@@ -18,6 +18,7 @@
 #### Private Classes
 
 * `letsencrypt::config`: Configures the Let's Encrypt client.
+* `letsencrypt::scripts`: Deploy helper scripts scripts
 
 ### Defined types
 

manifests/certonly.pp

@@ -141,6 +141,8 @@
     fail("The 'webroot_paths' parameter must be specified when using the 'webroot' plugin")
   }
 
+  include letsencrypt::scripts
+
   # Wildcard-less title for use in file paths
   $title_nowc = regsubst($title, '^\*\.', '')
 
@@ -252,7 +254,7 @@
     environment => $environment,
     provider    => 'shell',
     require     => [
-      Class['letsencrypt'],
+      Exec['initialize letsencrypt'],
       File['/usr/local/sbin/letsencrypt-domain-validation'],
     ],
   }

manifests/init.pp

@@ -102,15 +102,6 @@
     refreshonly => true,
   }
 
-  # Used in letsencrypt::certonly Exec["letsencrypt certonly ${title}"]
-  file { '/usr/local/sbin/letsencrypt-domain-validation':
-    ensure => file,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0500',
-    source => "puppet:///modules/${module_name}/domain-validation.sh",
-  }
-
   $certificates.each |$certificate, $properties| {
     letsencrypt::certonly { $certificate: * => $properties }
   }

manifests/scripts.pp

@@ -0,0 +1,16 @@
+# @summary Deploy helper scripts scripts
+#
+# @api private
+#
+class letsencrypt::scripts () {
+  assert_private()
+
+  # required in letsencrypt::certonly
+  file { '/usr/local/sbin/letsencrypt-domain-validation':
+    ensure  => file,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0500',
+    content => file("${module_name}/domain-validation.sh"),
+  }
+}

spec/classes/letsencrypt_spec.rb

@@ -19,15 +19,6 @@
 
           epel = facts[:osfamily] == 'RedHat' && facts[:operatingsystem] != 'Fedora'
 
-          it 'contains File[/usr/local/sbin/letsencrypt-domain-validation]' do
-            is_expected.to contain_file('/usr/local/sbin/letsencrypt-domain-validation').
-              with_ensure('file').
-              with_owner('root').
-              with_group('root').
-              with_mode('0500').
-              with_source('puppet:///modules/letsencrypt/domain-validation.sh')
-          end
-
           it 'contains the correct resources' do
             is_expected.to contain_class('letsencrypt::install').
               with(configure_epel: epel).
@@ -151,6 +142,7 @@
             } }
           end
 
+          it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_letsencrypt__certonly('foo').with_domains(%w[lth0edae4nzfq895 nsgqqm4mbw257t9i]) }
           it { is_expected.to contain_letsencrypt__certonly('a').with_environment(%w[ABC=y9jby5nmfgmstnbk DFE=y00lt0fh1vj2amjx]) }
         end

spec/defines/letsencrypt_certonly_spec.rb

@@ -20,6 +20,17 @@
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_class('Letsencrypt::Install') }
         it { is_expected.to contain_class('Letsencrypt::Config') }
+        it { is_expected.to contain_class('Letsencrypt::Scripts') }
+
+        # letsencrypt::scripts is a private class and is therefore tested in this define
+        it 'contains the domain validation script' do
+          is_expected.to contain_file('/usr/local/sbin/letsencrypt-domain-validation').
+            with_ensure('file').
+            with_owner('root').
+            with_group('root').
+            with_mode('0500').
+            with_content(%r{#!/bin/sh})
+        end
 
         if facts[:osfamily] == 'FreeBSD'
           it { is_expected.to contain_file('/usr/local/etc/letsencrypt') }