diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-01-18 01:16:50 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-01-18 06:02:26 +0300 |
| commit | 20bd14fe7bf04f1acba968f017b7a433c5f179e1 (patch) | |
| tree | e19d412e1ed67d544565f4e6969ffcf012d3423f /bin | |
| parent | 5a16d57cf559f10a1902e70e720df565b8aefeb1 (diff) | |
wizard: fix letsencrypt empty emailv1.34.2
Signed-off-by: nachoparker <nacho@ownyourbits.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ncp-diag | 12 | ||||
| -rw-r--r-- | bin/ncp/NETWORKING/letsencrypt.sh | 2 | ||||
| -rw-r--r-- | bin/ncp/NETWORKING/no-ip.sh | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/bin/ncp-diag b/bin/ncp-diag index 4d2d0fc9..ef0d879c 100644 --- a/bin/ncp-diag +++ b/bin/ncp-diag @@ -64,11 +64,13 @@ echo "internet check|$( ping -W 2 -w 1 -q github.com &>/dev/null && echo ok || e function is_port_open() { - PORT=$1 - tmp_file=$(mktemp) - v=$(wget -T2 -t1 -q --keep-session-cookies --save-cookies $tmp_file https://portchecker.co -O - | grep -oP "_csrf\" value=\"\K.*\"") - wget -T2 -t1 -q --load-cookies $tmp_file https://portchecker.co --post-data "port=$PORT&_csrf=${v::-1}" -O - \ - | grep -q '<span class="green">open</span>' && { echo "open"; return 1; } + local PORT=$1 + local tmp_file=$(mktemp) + local v=$(wget -T2 -t1 -q --keep-session-cookies --save-cookies $tmp_file https://portchecker.co -O - | grep -oP "_csrf\" value=\"\K.*\"") + if [[ "$v" != "" ]]; then + wget -T2 -t1 -q --load-cookies $tmp_file https://portchecker.co --post-data "port=$PORT&_csrf=${v::-1}" -O - \ + | grep -q '<span class="green">open</span>' && { echo "open"; return 1; } + fi echo "closed" rm $tmp_file } diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh index 449a5dc2..415567b0 100644 --- a/bin/ncp/NETWORKING/letsencrypt.sh +++ b/bin/ncp/NETWORKING/letsencrypt.sh @@ -62,7 +62,7 @@ configure() domain_string+=",${domain}" } done - $letsencrypt certonly -n --force-renew --no-self-upgrade --webroot -w $ncdir --hsts --agree-tos -m $EMAIL -d $domain_string && { + "${letsencrypt}" certonly -n --force-renew --no-self-upgrade --webroot -w "${ncdir}" --hsts --agree-tos -m "${EMAIL}" -d "${domain_string}" && { # Set up auto-renewal cat > /etc/cron.weekly/letsencrypt-ncp <<EOF diff --git a/bin/ncp/NETWORKING/no-ip.sh b/bin/ncp/NETWORKING/no-ip.sh index 6e1c910d..1072c3c4 100644 --- a/bin/ncp/NETWORKING/no-ip.sh +++ b/bin/ncp/NETWORKING/no-ip.sh @@ -37,7 +37,7 @@ install() ### END INIT INFO EOF - cat debian.noip2.sh >> /etc/init.d/noip2 + cat debian.noip2.sh >> /etc/init.d/noip2 chmod +x /etc/init.d/noip2 cd - |