populate the correct config directory

1 files changed, 8 insertions, 6 deletions

diff --git a/modules/certbot/manifests/init.pp b/modules/certbot/manifests/init.pp
index c3f0c9e..e0e78ab 100644
--- a/modules/certbot/manifests/init.pp
+++ b/modules/certbot/manifests/init.pp
@@ -1,8 +1,10 @@
 class certbot($config_dir=undef) {
   if $config_dir {
+    $_config_dir = $config_dir
     $config_dir_opts = " --config-dir ${config_dir}"
   }
   else {
+    $_config_dir = "/etc/letsencrypt"
     $config_dir_opts = ""
   }
 
@@ -25,21 +27,21 @@ class certbot($config_dir=undef) {
         Package['certbot'],
         Class['cron'],
       ];
-    '/etc/letsencrypt/renewal-hooks':
+    "${_config_dir}/renewal-hooks":
       ensure => directory,
       require => Package['certbot'];
-    '/etc/letsencrypt/renewal-hooks/deploy':
+    "${_config_dir}/renewal-hooks/deploy":
       ensure => directory,
-      require => File['/etc/letsencrypt/renewal-hooks'];
-    '/etc/letsencrypt/renewal-hooks/deploy/reload-cert':
+      require => File["${_config_dir}/renewal-hooks"];
+    "${_config_dir}/renewal-hooks/deploy/reload-cert":
       source => 'puppet:///modules/certbot/reload-cert',
-      require => File['/etc/letsencrypt/renewal-hooks/deploy'];
+      require => File["${_config_dir}/renewal-hooks/deploy"];
   }
 
   exec { "initial certbot run":
     # XXX update to real domain name
     command => "/usr/bin/certbot -n --agree-tos -m doy@tozt.net --nginx -d new.tozt.net${config_dir_opts}",
-    creates => "/etc/letsencrypt/live",
+    creates => "${_config_dir}/live",
     require => [
       Package["certbot"],
       # not Class["nginx"], because of circular dependencies with nginx::site