From 73af7708a031cd9818765e0978b8f4c597b1997b Mon Sep 17 00:00:00 2001
From: Yaroslav <hello@unimarijo.com>
Date: Wed, 28 Nov 2018 18:04:05 +0400
Subject: [PATCH] Code formatting

---
 .gitignore          |  1 +
 init-letsencrypt.sh | 35 +++++++++++------------------------
 2 files changed, 12 insertions(+), 24 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..68f5d13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/data/certbot
diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh
index 330c38f..0504433 100644
--- a/init-letsencrypt.sh
+++ b/init-letsencrypt.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-domains=( "example.org" "example.com" )
+domains=( "example.com" "example.org" )
 rsa_key_size=4096
 data_path="./data/certbot"
-email="" #Adding a valid address is strongly recommended 
-staging=0 #Set to 1 if you're just testing your setup to avoid hitting request limits
+email="" # Adding a valid address is strongly recommended
+staging=0 # Set to 1 if you're just testing your setup to avoid hitting request limits
 
 echo "### Preparing directories in $data_path ..."
 rm -Rf "$data_path"
@@ -15,14 +15,11 @@ mkdir -p "$data_path/conf/live/$domains"
 echo "### Creating dummy certificate ..."
 path="/etc/letsencrypt/live/$domains"
 mkdir -p "$path"
-docker-compose run --rm --entrypoint "\
-    openssl req -x509 -nodes -newkey rsa:1024 -days 1\
-      -keyout '$path/privkey.pem' \
-      -out '$path/fullchain.pem' \
-      -subj '/CN=localhost'" certbot
+docker-compose run --rm --entrypoint "openssl req -x509 -nodes -newkey rsa:4096 \
+    -days 10 -keyout '$path/privkey.pem' -out '$path/fullchain.pem' -subj '/CN=localhost'" certbot
 
 
-echo "### Downloading recommended HTTPS parameters ..."
+echo "### Downloading recommended TLS parameters ..."
 curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf"
 curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem"
 
@@ -34,35 +31,25 @@ docker-compose up -d nginx
 echo "### Deleting dummy certificate ..."
 sudo rm -Rf "$data_path/conf/live"
 
-echo "### Downloading recommended TLS options ..."
-curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf"
-curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem"
-
 
 echo "### Requesting initial certificate ..."
 
-#Join $domains to -d args
+# Join $domains to -d args
 domain_args=""
 for domain in "${domains[@]}"; do
   domain_args="$domain_args -d $domain"
 done
 
-#Select appropriate email arg
+# Select appropriate email arg
 case "$email" in
   "") email_arg="--register-unsafely-without-email" ;;
   *) email_arg="--email $email" ;;
 esac
 
-#Enable staging mode if needed
+# Enable staging mode if needed
 if [ $staging != "0" ]; then staging_arg="--staging"; fi
 
-docker-compose run --rm --entrypoint "\
-  certbot certonly --webroot -w /var/www/certbot \
-    $staging_arg \
-    $email_arg \
-    $domain_args \
-    --rsa-key-size $rsa_key_size \
-    --agree-tos \
-    --force-renewal" certbot
+docker-compose run --rm --entrypoint "certbot certonly --webroot -w /var/www/certbot $staging_arg $email_arg \
+    $domain_args --rsa-key-size $rsa_key_size --agree-tos --force-renewal" certbot
 
 docker-compose stop nginx