Improve mail setup.

[config] / all_new_2018 / letsencrypt.sh

diff --git a/all_new_2018/letsencrypt.sh b/all_new_2018/letsencrypt.sh
index c89e37f660afabe10a5df008a06a3d5fdaee2824..5fdf7036b5596c5267f653094826e2e6cb028357 100755 (executable)
--- a/all_new_2018/letsencrypt.sh
+++ b/all_new_2018/letsencrypt.sh
@@ -1,50 +1,29 @@
 #!/bin/sh
-# Install or copy LetsEncrypt certificates on/from server.
-#
-# First argument: server
-# Second argument: either "set" or "get" or "put"
-#
-# "set" install certbot on remote server and requests a new certificate
-# for it. This needs two more arguments: an e-mail address for future
-# communication with LetsEncrypt, and the domain for which to request
-# the certificate (might plausibly be equivalent to the first argument
-# though). This needs port 80 open on the server.
-#
-# "get" copies the server's /etc/letsencrypt to a local letsencrypt.tar.
-#
-# "set" copies a local letsencrypt.tar to the server's /etc/letsencrypt.
 set -e
 
-# Ensure we have a server name as argument.
-if [ $# -lt 2 ]; then
-    echo "Need server and action as arguments."
+# Ensure we have a mail address as argument.
+if [ $# -lt 1 ]; then
+    echo "Need mail address as argument."
     false
 fi
-server="$1"
-action="$2"
+mail_address="$1"
 
-# So we only get asked once for decrypting our key.
-eval $(ssh-agent)
-ssh-add ~/.ssh/id_rsa
+# We need certbot to get LetsEncrypt certificates.
+apt install -y certbot
 
-if [ "${action}" = "set" ]; then
-    # Install certificate. This needs port 80 open (443 does not work here).
-    if [ $# -lt 4 ]; then
-        echo "Need mail address and domain as arguments."
-        false
-    fi
-    mail="$3"
-    domain="$4"
-    ssh -t plom@${server} "su -c 'apt -y install certbot && certbot certonly --standalone --agree-tos -m ${mail} -d ${server}'"
-elif [ "${action}" = "get" ]; then
-    # Get /etc/letsencrypt/ as tar file.
-    ssh -t plom@${server} 'su -c "cd /etc/ && tar cf letsencrypt.tar letsencrypt && chown plom:plom letsencrypt.tar && mv letsencrypt.tar /home/plom/"'
-    scp plom@${server}:~/letsencrypt.tar .
-elif [ "${action}" = "put" ]; then
-    # Expand letsencrypt.tar to /etc/letsencrypt/ on server.
-    scp letsencrypt.tar plom@${server}:~/
-    ssh -t plom@${server} 'su -c "rmdir /etc/letsencrypt && mv letsencrypt.tar /etc/ && cd /etc/ && tar xf letsencrypt.tar && rm letsencrypt.tar"'
-else
-    echo "Action must be 'set', 'get', or 'put'."
-    false
+# If port 80 blocked by iptables, open it.
+set +e
+iptables -C INPUT -p tcp --dport 80 -j ACCEPT
+open_iptables="$?"
+set -e
+if [ "${open_iptables}" -eq "1" ]; then
+    iptables -A INPUT -p tcp --dport 80 -j ACCEPT
+fi
+
+# Create new certificate and copy it to /etc/letsencrypt.
+certbot certonly --standalone --agree-tos -m "${mail_address}" -d "$(hostname -f)"
+
+# Remove iptables rule to open port 80 if we added it.
+if [ "${open_iptables}" -eq "1" ]; then
+    iptables -D INPUT -p tcp --dport 80 -j ACCEPT
 fi