From c638af630e56ef44c4d58365ec00787818f4c693 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 16 Nov 2016 11:26:26 -0200
Subject: Switch base_path to script_base

---
 manifests/init.pp       | 4 ++--
 manifests/manage.pp     | 2 +-
 manifests/standalone.pp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 57c06fc..d8b6ccd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,5 +1,5 @@
 class certbot(
-  $base_path = '/usr/bin',
+  $script_base = '/usr/bin',
   $basedir   = '/var/spool/certbot',
   $owner     = 'www-data',
   $pre_hook  = '',
@@ -37,7 +37,7 @@ class certbot(
 
   # Chosing an arbitrary minite within the hour in the hope that won't overload Let's Encrypt servers
   cron { 'certbot-renew':
-    command => "${base_path}/${tool} renew --standalone --quiet ${real_pre_hook} ${real_post_hook}",
+    command => "${script_base}/${tool} renew --standalone --quiet ${real_pre_hook} ${real_post_hook}",
     user    => 'root',
     hour    => [ 5, 23 ],
     minute  => "28",
diff --git a/manifests/manage.pp b/manifests/manage.pp
index 2481a8d..e09621a 100644
--- a/manifests/manage.pp
+++ b/manifests/manage.pp
@@ -27,7 +27,7 @@ define certbot::manage(
 
   # Make sure nginx is restarted and request a certificate
   exec { "certbot-${name}":
-    command => "${real_pre_hook}${certbot::base_path}/${certbot::tool} certonly --webroot -w ${::certbot::basedir}/${name} -d ${name} ${domains} -m ${email} --rsa-key-size ${size} --agree-tos",
+    command => "${real_pre_hook}${certbot::script_base}/${certbot::tool} certonly --webroot -w ${::certbot::basedir}/${name} -d ${name} ${domains} -m ${email} --rsa-key-size ${size} --agree-tos",
     creates => "/etc/letsencrypt/archive/${name}",
     require => File["${::certbot::basedir}/${name}"],
   }
diff --git a/manifests/standalone.pp b/manifests/standalone.pp
index ac2ddaa..1442788 100644
--- a/manifests/standalone.pp
+++ b/manifests/standalone.pp
@@ -1,9 +1,9 @@
 class certbot::standalone {
   # Warning: this offers poor verification for the downloaded application
   exec { 'getcertbot':
-    command => "/usr/bin/wget https://dl.eff.org/certbot-auto -O ${certbot::base_path}/${certbot::tool} && chmod +x ${certbot::base_path}/${certbot::tool}",
+    command => "/usr/bin/wget https://dl.eff.org/certbot-auto -O ${certbot::script_base}/${certbot::tool} && chmod +x ${certbot::script_base}/${certbot::tool}",
     user    => 'root',
     cwd     => '/tmp',
-    creates => '${certbot::base_path}/${certbot::tool}',
+    creates => '${certbot::script_base}/${certbot::tool}',
   }
 }
-- 
cgit v1.2.3