letsencrypt-tiny: use embedded acme-tiny

diff --git a/letsencrypt-tiny b/letsencrypt-tiny
index 7ca3f556f821cd62b14724f4ca75bf03610f3dcf..7f23ad5cc0e0242c10272dad17533792a073c529 100755 (executable)
--- a/letsencrypt-tiny
+++ b/letsencrypt-tiny
@@ -63,7 +63,7 @@ def acme(keyfilename, certfilename, domains):
         file.write(csr)
     try:
         # call acme-tiny as a script
         file.write(csr)
     try:
         # call acme-tiny as a script

-        acme_tiny = os.path.join(config['acme']['acme-tiny'], 'acme_tiny.py')
+        acme_tiny = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'acme-tiny', 'acme_tiny.py')

         signed_crt = subprocess.check_output(["python", acme_tiny, "--quiet", "--account-key", accountkey, "--csr", csrfilename, "--acme-dir", config['acme']['challenge-dir']])
         # save new certificate
         make_backup(certfilename)
         signed_crt = subprocess.check_output(["python", acme_tiny, "--quiet", "--account-key", accountkey, "--csr", csrfilename, "--acme-dir", config['acme']['challenge-dir']])
         # save new certificate
         make_backup(certfilename)

diff --git a/letsencrypt-tiny.conf.sample b/letsencrypt-tiny.conf.sample
index 3df2422acb48ec0757c7bcc818daa3d839e378e5..178eeadacf39fad7b9f2abd17e8a3e6e959e4b4b 100644 (file)
--- a/letsencrypt-tiny.conf.sample
+++ b/letsencrypt-tiny.conf.sample
@@ -24,9 +24,8 @@ post-certchange = /home/user/letsencrypt/cert-hook
 # Example usage: Updating TLSA records (with the selector being SubjectPublicKeyInfo) in the zone
 post-keychange = /home/user/letsencrypt/key-hook
 
 # Example usage: Updating TLSA records (with the selector being SubjectPublicKeyInfo) in the zone
 post-keychange = /home/user/letsencrypt/key-hook
 

-# Parameters for acme-tiny <https://github.com/diafygi/acme-tiny/>
+# Parameters for the embedded acme-tiny <https://github.com/diafygi/acme-tiny/>

 [acme]
 [acme]

-acme-tiny = /home/user/letsencrypt/acme-tiny/

 account-key = /etc/ssl/private/letsencrypt/account.key
 challenge-dir = /srv/acme-challenge/
 
 account-key = /etc/ssl/private/letsencrypt/account.key
 challenge-dir = /srv/acme-challenge/