Merge branch 'master' of git.oopen.de:install/apache2

This commit is contained in:
Christoph 2023-06-19 01:12:40 +02:00
commit 4f7b41dadd
2 changed files with 51 additions and 9 deletions

View File

@ -0,0 +1,13 @@
-----BEGIN DH PARAMETERS-----
MIICCAKCAgEAuVoHBjUlcXhHIZ596s9F/iH2KPgCAkyiYoiFxnyh/kKrWlcD58Dm
t3R5MxJi63RX76mb+b5h5aZR4mE/IAQ16sMrr4kb+E6nqhwsHVyxKb4tlNAN8tUW
59zQPKKbHneGjzIg2htcP5dKs7RK8ON2U1dY+XhydjV6Id/2aq1tck7pkDci/gI0
hu6L/VKHxzXm+uaJxteo2GSFe9o/LZqt7N7DJzwB71aEJ8U52OcMnvMV6ObZ4v0Y
pvVdL9kiyHcudN7aFAXpSJYU9dMrEqBxuYULFYjvVIRLqg0u+GWIcZ8Y+vOTigz+
wMpFFEMQ/ze1z1EUtjuEnTwzdNLEfMEzA4teUheRBmA/94DUkGA1lTha9PyIxNiJ
fInegAHllqJEdb9fp8pkh5JamwJZa1rPwm8qNkiLzwj0m87FeGhpEHuUJnoMZA8+
N/UQkiuEK/6H2tSd+vnvqIIyCx9WslgiF4BDaVLKKTkkpKg3tZyQsHoC/euf0tSP
V1zpaXN5sYuwqDDebigiKER+Opp+tuNObUDdGGQR8S3oeb2bNGBdIzD9LPq/7j6M
yi9Sazx82kxb7Ph4yo5yoKo4eyVEYBotuHF7xsDbeQi9ZtZWgdhxjYRNW7f2DEAf
YeldWU/EKccFxXixp6DmhIcDI2E/hdJ9peiDXgmrFsHF1W82G5uu0/cCAQI=
-----END DH PARAMETERS-----

View File

@ -2275,16 +2275,45 @@ else
fi
echo "" >> ${_logdir}/main.log
echo "## - Generate a dhparam.pem file .." >> ${_logdir}/main.log
echo "## -" >> ${_logdir}/main.log
echo "openssl dhparam -dsaparam -out $PREFIX/conf/ssl/dhparam.pem 4096" >> ${_logdir}/main.log
echononl "\tGenerate a dhparam.pem file.."
openssl dhparam -dsaparam -out $PREFIX/conf/ssl/dhparam.pem 4096 >> ${_logdir}/main.log 2>&1
if [ "0" = "$?" ];then
echo_ok
if [[ "$os_dist" = "debian" ]] && [[ $os_version -gt 11 ]]; then
if [[ -f "dhparam-openssl-3.0-4096.pem" ]] ; then
echo "## - Copy dhparam.pem to '$PREFIX/conf/ssl/dhparam.pem'.." >> ${_logdir}/main.log
echo "## -" >> ${_logdir}/main.log
echo "cp \"${_builddir}/dhparam-openssl-3.0-4096.pem\" \"$PREFIX/conf/ssl/dhparam.pem\""
cp "${_builddir}/dhparam-openssl-3.0-4096.pem" "$PREFIX/conf/ssl/dhparam.pem" >> ${_logdir}/main.log
if [[ $? -eq 0 ]];then
echo_ok
else
echo_failed
warn " Copiing 'dhparam-openssl-3.0-4096.pem' to '$PREFIX/conf/ssl/dhparam.pem' failed"
fi
else
warn "Generating dhparam.pem file may take a very long time."
echo "## - Generate a dhparam.pem file .." >> ${_logdir}/main.log
echo "## -" >> ${_logdir}/main.log
echo "openssl dhparam -out $PREFIX/conf/ssl/dhparam.pem 4096" >> ${_logdir}/main.log
echononl "\tGenerate a dhparam.pem file.."
openssl dhparam -out $PREFIX/conf/ssl/dhparam.pem 4096 >> ${_logdir}/main.log 2>&1
if [[ $? -eq 0 ]];then
echo_ok
else
echo_failed
warn " Generating dhparam.pem file '$PREFIX/conf/ssl/dhparam.pem' failed"
fi
fi
else
echo_failed
warn " Generating dhparam.pem file '$PREFIX/conf/ssl/dhparam.pem' failed"
echo "## - Generate a dhparam.pem file .." >> ${_logdir}/main.log
echo "## -" >> ${_logdir}/main.log
echo "openssl dhparam -dsaparam -out $PREFIX/conf/ssl/dhparam.pem 4096" >> ${_logdir}/main.log
echononl "\tGenerate a dhparam.pem file.."
openssl dhparam -dsaparam -out $PREFIX/conf/ssl/dhparam.pem 4096 >> ${_logdir}/main.log 2>&1
if [[ $? -eq 0 ]];then
echo_ok
else
echo_failed
warn " Generating dhparam.pem file '$PREFIX/conf/ssl/dhparam.pem' failed"
fi
fi