add cron_success_command

Author: Philipp Gassmann

manifests/init.pp

@@ -29,11 +29,12 @@
 #
 class letsencrypt_nginx (
   $default_server_name  = 'default',
-  $webroot             = '/var/lib/letsencrypt/webroot',
-  $firstrun_webroot    = undef, # For Debian & Nginx: /usr/share/nginx/html
-  $firstrun_standalone = false,
-  $locations           = {},
+  $webroot              = '/var/lib/letsencrypt/webroot',
+  $firstrun_webroot     = undef, # For Debian & Nginx: /usr/share/nginx/html
+  $firstrun_standalone  = false,
+  $locations            = {},
   $servers              = {},
+  $cron_success_command = '/bin/systemctl reload nginx.service',
 ) {
   include nginx
   require ::letsencrypt

manifests/server.pp

@@ -33,15 +33,22 @@
 #    Runs daily but only renews if near expiration, e.g. within 10 days.
 #
 define letsencrypt_nginx::server(
-  $server          = $name,
-  $domains         = undef,
-  $exclude_domains = [],
-  $webroot_paths   = undef,
-  $additional_args = undef,
-  $manage_cron     = true,
+  $server               = $name,
+  $domains              = undef,
+  $exclude_domains      = [],
+  $webroot_paths        = undef,
+  $additional_args      = undef,
+  $manage_cron          = true,
+  $cron_success_command = undef
 ){
   include letsencrypt_nginx
 
+  if $cron_success_command {
+    $real_cron_success_command = $cron_success_command
+  } else {
+    $real_cron_success_command = $letsencrypt_nginx::cron_success_command
+  }
+
   if is_hash($::facts) {
     $firstrun_fact = $::facts['letsencrypt_nginx_firstrun']
   } else {
@@ -94,11 +101,12 @@
   # Always define letsencrypt::certonly with webroot for cronjob,
   # exec will not be executed again, if certificate exists
   letsencrypt::certonly{ $name:
-    plugin          => 'webroot',
-    domains         => $real_domains,
-    webroot_paths   => $real_webroot_paths,
-    additional_args => $additional_args,
-    manage_cron     => $manage_cron,
-    notify          => Service['nginx'];
+    plugin               => 'webroot',
+    domains              => $real_domains,
+    webroot_paths        => $real_webroot_paths,
+    additional_args      => $additional_args,
+    manage_cron          => $manage_cron,
+    cron_success_command => $real_cron_success_command,
+    notify               => Service['nginx'];
   }
 }

spec/defines/server_spec.rb

@@ -147,6 +147,7 @@ class { ::letsencrypt:
       :notify  => 'Service[nginx]',
       :manage_cron    => true,
       :plugin  => 'webroot',
+      :cron_success_command => '/bin/systemctl reload nginx.service',
     )}
   end
   context "with firstrun_standalone mode success" do
@@ -186,6 +187,7 @@ class { ::letsencrypt:
       :domains => [ 'd1.foo.com', 'd2.bar.com'],
       :notify  => 'Service[nginx]',
       :plugin  => 'webroot',
+      :cron_success_command => '/bin/systemctl reload nginx.service',
     )}
   end
   context "with firstrun_webroot " do
@@ -222,6 +224,7 @@ class { ::letsencrypt:
       :notify  => 'Service[nginx]',
       :manage_cron    => true,
       :plugin         => 'webroot',
+      :cron_success_command => '/bin/systemctl reload nginx.service',
     )}
   end
   context "with firstrun_webroot success" do
@@ -263,6 +266,7 @@ class { ::letsencrypt:
       :notify  => 'Service[nginx]',
       :manage_cron    => true,
       :plugin         => 'webroot',
+      :cron_success_command => '/bin/systemctl reload nginx.service',
     )}
   end