diff --git a/rtinst.sh b/rtinst.sh index d81ec64..66114de 100644 --- a/rtinst.sh +++ b/rtinst.sh @@ -432,9 +432,8 @@ service ssh restart 1>> $logfile sshport=$(grep 'Port ' /etc/ssh/sshd_config | sed 's/[^0-9]*//g') echo "SSH port set to $sshport" -# Generate certificates +# Generate https/ssl certificates if [ -z "$(grep -s $serverip$ /etc/ssl/ruweb.cnf)" ]; then - echo "Creating certificate config file" cp /etc/ssl/openssl.cnf /etc/ssl/ruweb.cnf echo >> /etc/ssl/ruweb.cnf echo "[ v3_ca ]" >> /etc/ssl/ruweb.cnf @@ -450,7 +449,7 @@ if [ -z "$(grep -s $serverip$ /etc/ssl/ruweb.cnf)" ]; then openssl req -x509 -nodes -days 3650 -subj /CN=$serverip -config /etc/ssl/ruweb.cnf -newkey rsa:2048 -keyout /etc/ssl/private/ruweb.key -out /etc/ssl/ruweb.crt >> $logfile 2>&1 elif ! [[ -f /etc/ssl/ruweb.crt && -f /etc/ssl/private/ruweb.key ]]; then - echo "Generateing https/ssl certificates" + echo "Generateing https/ssl certificates - $serverip - $serverdn" openssl req -x509 -nodes -days 3650 -subj /CN=$serverip -config /etc/ssl/ruweb.cnf -newkey rsa:2048 -keyout /etc/ssl/private/ruweb.key -out /etc/ssl/ruweb.crt >> $logfile 2>&1 elif [[ ! -z "$serverdn" && -z "$(grep -s $serverdn /etc/ssl/ruweb.cnf)" ]]; then @@ -464,6 +463,7 @@ elif [[ ! -z "$serverdn" && -z "$(grep -s $serverdn /etc/ssl/ruweb.cnf)" ]]; the else sed -i "/DNS.$(( $dnno - 1 ))/ aDNS.$dnno = $serverdn" /etc/ssl/ruweb.cnf fi + echo "Generateing https/ssl certificates - $serverip - $serverdn" openssl req -x509 -nodes -days 3650 -subj /CN=$serverip -config /etc/ssl/ruweb.cnf -newkey rsa:2048 -keyout /etc/ssl/private/ruweb.key -out /etc/ssl/ruweb.crt >> $logfile 2>&1 fi