diff --git a/dhparam-openssl-3.0-4096.pem b/dhparam-openssl-3.0-4096.pem new file mode 100644 index 0000000..18d9e2a --- /dev/null +++ b/dhparam-openssl-3.0-4096.pem @@ -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----- diff --git a/install_httpd-2.4.sh b/install_httpd-2.4.sh index 1c1a9a7..95c017f 100755 --- a/install_httpd-2.4.sh +++ b/install_httpd-2.4.sh @@ -1264,9 +1264,9 @@ else fi echo "" >> ${_logdir}/main.log - echo "chown -R root.root apr-$APR_VERSION" >> ${_logdir}/main.log + echo "chown -R root:root apr-$APR_VERSION" >> ${_logdir}/main.log echo "" >> ${_logdir}/main.log - chown -R root.root apr-$APR_VERSION || fatal "Changing permissions of \"apr-$APR_VERSION\" failed" + chown -R root:root apr-$APR_VERSION || fatal "Changing permissions of \"apr-$APR_VERSION\" failed" ## - build and install apr ## - @@ -1421,9 +1421,9 @@ else echo "" >> ${_logdir}/main.log - echo "chown -R root.root apr-util-$APR_UTIL_VERSION" >> ${_logdir}/main.log + echo "chown -R root:root apr-util-$APR_UTIL_VERSION" >> ${_logdir}/main.log echo "" >> ${_logdir}/main.log - chown -R root.root apr-util-$APR_UTIL_VERSION || fatal "Changing permissions of \"apr-util-$APR_UTIL_VERSION\" failed." + chown -R root:root apr-util-$APR_UTIL_VERSION || fatal "Changing permissions of \"apr-util-$APR_UTIL_VERSION\" failed." ## - build and install apr-util ## - @@ -1582,9 +1582,9 @@ fi echo "" >> ${_logdir}/main.log -echo "chown -R root.root httpd-$APACHE_VERSION" >> ${_logdir}/main.log +echo "chown -R root:root httpd-$APACHE_VERSION" >> ${_logdir}/main.log echo "" >> ${_logdir}/main.log -chown -R root.root httpd-$APACHE_VERSION || fatal "Changing permissions of \"httpd-$APACHE_VERSION\" failed." +chown -R root:root httpd-$APACHE_VERSION || fatal "Changing permissions of \"httpd-$APACHE_VERSION\" failed." if [ "httpd-$APACHE_VERSION" != "`basename $_builddir`" ]; then @@ -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 @@ -3262,9 +3291,9 @@ if $WITH_MOD_FCGID ; then fi echo "" >> ${_logdir}/main.log - echo "chown -R root.root mod_fcgid-${MOD_FCGID_VERSION}" >> ${_logdir}/main.log + echo "chown -R root:root mod_fcgid-${MOD_FCGID_VERSION}" >> ${_logdir}/main.log echo "" >> ${_logdir}/main.log - chown -R root.root mod_fcgid-${MOD_FCGID_VERSION} || fatal "Changing permissions of \"mod_fcgid-${MOD_FCGID_VERSION}\" failed" + chown -R root:root mod_fcgid-${MOD_FCGID_VERSION} || fatal "Changing permissions of \"mod_fcgid-${MOD_FCGID_VERSION}\" failed" echo "" >> ${_logdir}/main.log echo "## - Rename mod_fcgid-${MOD_FCGID_VERSION} to `basename $_builddir_fcgid` .." >> ${_logdir}/main.log @@ -3447,9 +3476,9 @@ if $WITH_MOD_PERL ; then fi echo "" >> ${_logdir}/main.log - echo "chown -R root.root mod_perl-${MOD_PERL_VERSION}" >> ${_logdir}/main.log + echo "chown -R root:root mod_perl-${MOD_PERL_VERSION}" >> ${_logdir}/main.log echo "" >> ${_logdir}/main.log - chown -R root.root mod_perl-${MOD_PERL_VERSION} || fatal "Changing permissions of \"mod_perl-${MOD_PERL_VERSION}\" failed" + chown -R root:root mod_perl-${MOD_PERL_VERSION} || fatal "Changing permissions of \"mod_perl-${MOD_PERL_VERSION}\" failed" echo "" >> ${_logdir}/main.log echo "## - Rename mod_perl-${MOD_PERL_VERSION} to `basename $_builddir_perl` .." >> ${_logdir}/main.log