From ec4e1d95d8c0db4435784fea575ac5e7fbbeb3d2 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sat, 4 Nov 2023 09:38:00 +0100 Subject: [PATCH] Don't ask to generate TLS certificate if one already exists. This is how it always was, but recent commit f756b7bea65ab9d306fe08c93918cf287b8370e7 caused prompting. --- Config | 62 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/Config b/Config index a7aae80db..f480ab6ad 100755 --- a/Config +++ b/Config @@ -520,36 +520,38 @@ if [ "$SSLDIR" != "" -a "$SSLDIR" != "/usr" ]; then read cc fi -TEST="" -while [ -z "$TEST" ] ; do - if [ "$GENCERTIFICATE" = "1" ] ; then - TEST="Yes" - else - TEST="No" - fi - echo "" - echo "UnrealIRCd requires a TLS certificate in order to work." - echo "Do you want to generate a TLS certificate for the IRCd?" - echo "Only answer No if you already have one." - echo $n "[$TEST] -> $c" - read cc - if [ -z "$cc" ] ; then - cc=$TEST - fi - case "$cc" in - [Yy]*) - GENCERTIFICATE="1" - ;; - [Nn]*) - GENCERTIFICATE="" - ;; - *) - echo "" - echo "You must enter either Yes or No" - TEST="" - ;; - esac -done +if [ ! -f $BASEPATH/conf/tls/server.cert.pem -a ! -f $BASEPATH/conf/ssl/server.cert.pem ]; then + TEST="" + while [ -z "$TEST" ] ; do + if [ "$GENCERTIFICATE" = "1" ] ; then + TEST="Yes" + else + TEST="No" + fi + echo "" + echo "UnrealIRCd requires a TLS certificate in order to work." + echo "Do you want to generate a self-signed TLS certificate for the IRCd?" + echo "Only answer No if you already have one." + echo $n "[$TEST] -> $c" + read cc + if [ -z "$cc" ] ; then + cc=$TEST + fi + case "$cc" in + [Yy]*) + GENCERTIFICATE="1" + ;; + [Nn]*) + GENCERTIFICATE="" + ;; + *) + echo "" + echo "You must enter either Yes or No" + TEST="" + ;; + esac + done +fi TEST="" while [ -z "$TEST" ] ; do