Switch base_path to script_base

diff --git a/manifests/init.pp b/manifests/init.pp
index 57c06fc3bdb4274b2b179b108aa9c88c21bf85c4..d8b6ccd29591381dcb35b5897348d959b01c3c2a 100644 (file)
--- 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 2481a8dcc268dd09d55591d7cd09ea10cfe0f10e..e09621aedef0a3b0ce442daa9a8a56292d994aa2 100644 (file)
--- 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 ac2ddaabadcfd295dd2b4b14caa97ed9ec36550b..1442788fd6a45ed6086ac1e6522f0e9b5353b593 100644 (file)
--- 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}',
   }
 }