From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 16 Jun 2016 22:09:19 +0000 (-0300)
Subject: Enhance certbot
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=576f8e33ff7c5e7b8f563289748f9b37840c6416;p=puppet-nginx.git

Enhance certbot
---

diff --git a/manifests/certbot.pp b/manifests/certbot.pp
index e024b32..07ea20d 100644
--- a/manifests/certbot.pp
+++ b/manifests/certbot.pp
@@ -14,6 +14,7 @@ define nginx::certbot(
   }
 
   exec { "certbot-${name}":
-    command => "/usr/bin/certbot certonly --webroot -w /var/www/certbot/${name} -d ${name} -m ${email} --rsa-key-size ${size} --agree-tos",
+    command => "/usr/bin/certbot certonly --webroot -w /var/www/certbot/${name} -d ${name} -d www.${name} -m ${email} --rsa-key-size ${size} --agree-tos",
+    creates => "/etc/letsencrypt/archive/${name}",
   }
 }
diff --git a/manifests/site.pp b/manifests/site.pp
index 14406d4..ec8ba69 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -52,7 +52,8 @@ define nginx::site(
 
   if $certbot == true {
     nginx::certbot { $name:
-      ensure => $ensure,
+      ensure  => $ensure,
+      require => File["/etc/nginx/sites-enabled/$name"],
     }
   }
 }