From b31055dff685dc162d47b50b7f5ef7dd52ab90eb Mon Sep 17 00:00:00 2001
From: Matthew Saunders Brown <msb@stackaas.com>
Date: Thu, 15 Apr 2021 13:16:58 -0700
Subject: [PATCH] installer updates

---
 README.md  |  2 +-
 install.sh | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a8857f0..e711512 100644
--- a/README.md
+++ b/README.md
@@ -7,5 +7,5 @@ Bash scripts and Let's Encrypt & Apache configurations for managing Let's Encryp
 cd /usr/local/src
 git clone https://git.stack-source.com/msb/letsencrypt-tools.git
 cd letsencrypt-tools
-./install.sh
+bash install.sh
 ```
diff --git a/install.sh b/install.sh
index a495759..0300148 100755
--- a/install.sh
+++ b/install.sh
@@ -6,13 +6,21 @@ if [ "$USER" != "root" ]; then
   exit
 fi
 
+# check for existing Let's Encrypt install
+if [ -d "/etc/letsencrypt/" ]; then
+  echo "WARNING: Let's Encrypt is already installed."
+  echo "This installer will overwrite existing configurations."
+  echo -e "You have five seconds to execute ctrl-c to cancel this install.\a"
+  sleep 5
+fi
+
 apt-get -y install python3-certbot-apache
 
 mkdir /etc/ssl/letsencrypt
 chmod 750 /etc/ssl/letsencrypt
 chgrp ssl-cert /etc/ssl/letsencrypt
 
-# Let's Encrypt
+# Let's Encrypt configurations
 cp etc/letsencrypt/cli.ini /etc/letsencrypt/cli.ini
 chmod 644 /etc/letsencrypt/cli.ini
 chown root:root /etc/letsencrypt/cli.ini
@@ -28,7 +36,7 @@ chown root:root /etc/letsencrypt/renewal-hooks/post/sync-certs-to-etc-ssl.sh
 domain=`hostname -d`
 if [ -n "$domain" ]; then
   echo "email = hostmaster@$domain" >> /etc/letsencrypt/cli.ini
-  echo "Lets' Encrypt email set to hostmaster@$domain"
+  echo "Let's Encrypt email set to hostmaster@$domain"
 else
   echo "Server DNS domain name not set, Lets' Encrypt email setting left unconfigured."
 fi
@@ -38,5 +46,6 @@ a2enmod --quiet proxy
 a2enconf --quiet certbot
 systemctl restart apache2
 
-chmod 755 bin/*
-cp bin/* /usr/local/bin/
+# install Let's Encrypt user scripts
+cp bin/letsencrypt-* /usr/local/bin
+chmod 755 /usr/local/bin/letsencrypt-*