From 4d86bdc502d1957e6513e4b232cd5fbc976fbeb3 Mon Sep 17 00:00:00 2001 From: Trevor Mack Date: Sat, 25 Jul 2020 11:22:02 -0400 Subject: [PATCH 1/3] Update certbot nginx+ssl configuration file source changes Running the 2.x script ends with 2 files for certbot that have the following source showing that the curl request failed with a file not found. ``` curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx.conf 404: Not Found% ``` and ``` curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/ssl-dhparams.pem 404: Not Found% ``` --- init-letsencrypt.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh index f282b371..f06a9a83 100755 --- a/init-letsencrypt.sh +++ b/init-letsencrypt.sh @@ -80,8 +80,11 @@ fi if [ ! -e "$data_path/conf/options-ssl-nginx.conf" ] || [ ! -e "$data_path/conf/ssl-dhparams.pem" ]; then echo "### Downloading recommended TLS parameters ..." mkdir -p "$data_path/conf" + curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf" + curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem" + curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/tls_configs/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" + curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem" echo fi From 176fc9e34680b0106805727108f5725e164272fb Mon Sep 17 00:00:00 2001 From: Trevor Mack Date: Sat, 25 Jul 2020 11:25:59 -0400 Subject: [PATCH 2/3] Update init-letsencrypt.sh --- init-letsencrypt.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh index f06a9a83..37df75b9 100755 --- a/init-letsencrypt.sh +++ b/init-letsencrypt.sh @@ -80,10 +80,7 @@ fi if [ ! -e "$data_path/conf/options-ssl-nginx.conf" ] || [ ! -e "$data_path/conf/ssl-dhparams.pem" ]; then echo "### Downloading recommended TLS parameters ..." mkdir -p "$data_path/conf" - curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf" - curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem" - - curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf" + curl -s curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf" curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem" echo fi From f47f881dbcc66e74ec0a1a6a746b935dda85f953 Mon Sep 17 00:00:00 2001 From: Trevor Mack Date: Sat, 25 Jul 2020 11:26:16 -0400 Subject: [PATCH 3/3] Update init-letsencrypt.sh --- init-letsencrypt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh index 37df75b9..24b5284b 100755 --- a/init-letsencrypt.sh +++ b/init-letsencrypt.sh @@ -80,7 +80,7 @@ fi if [ ! -e "$data_path/conf/options-ssl-nginx.conf" ] || [ ! -e "$data_path/conf/ssl-dhparams.pem" ]; then echo "### Downloading recommended TLS parameters ..." mkdir -p "$data_path/conf" - curl -s curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf" + curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf" curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem" echo fi