From 3738a189c746733754b9fb86274d2114e8b764dc Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Wed, 10 May 2017 10:50:28 +0200
Subject: [PATCH] evoacme: always strip .conf suffix

---
 evoacme/files/evoacme.sh  | 2 +-
 evoacme/files/make-csr.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evoacme/files/evoacme.sh b/evoacme/files/evoacme.sh
index 15709401..a6eeb4c5 100755
--- a/evoacme/files/evoacme.sh
+++ b/evoacme/files/evoacme.sh
@@ -5,7 +5,7 @@
 [ -z "${CSR_DIR}" ] && CSR_DIR='/etc/ssl/requests'
 [ -z "${SELF_SIGNED_DIR}" ] && SELF_SIGNED_DIR='/etc/ssl/self-signed'
 
-vhost=$1
+vhost=$(basename $1 .conf)
 
 SSL_EMAIL=$(grep emailAddress /etc/letsencrypt/openssl.cnf|cut -d'=' -f2|xargs)
 if [ -n "$SSL_EMAIL" ]; then
diff --git a/evoacme/files/make-csr.sh b/evoacme/files/make-csr.sh
index 69c7b71a..a18b99ab 100755
--- a/evoacme/files/make-csr.sh
+++ b/evoacme/files/make-csr.sh
@@ -7,7 +7,7 @@
 
 shopt -s extglob
 
-vhost=$1
+vhost=$(basename $1 .conf)
 vhostfiles=$(ls -1 /etc/{nginx,apache2}/sites-enabled/${vhost}?(.conf) 2>/dev/null)
 
 if [ $(echo "${vhostfiles}"|wc -l) -lt 1 ]; then