From b90c692af1b4b3b192e6c00da0cdcb34d23da511 Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 2 Jul 2026 01:19:38 +0200 Subject: [PATCH] install_postfixadmin.sh: create composer.lock bevor installing/updating postfixadmin. --- install_postfixadmin.sh | 99 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 3 deletions(-) diff --git a/install_postfixadmin.sh b/install_postfixadmin.sh index 52acfc3..1bd9d2d 100755 --- a/install_postfixadmin.sh +++ b/install_postfixadmin.sh @@ -1182,21 +1182,114 @@ else echo_ok fi +echononl "\tMake file composer.json writable.." +chown ${HTTP_USER} ${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/composer.json > $log_file 2>&1 +if [[ $? -eq 0 ]]; then + echo_ok +else + echo_failed + error "$(cat $log_file)" + + echononl "\tcontinue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/nno]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Script terminated by user input.." +fi + +echononl "\tCreate composer.lock file.." +if [[ ${PF_ADMIN_MAJOR_VERSION} -gt 3 ]] ; then + if $PHP_DEBIAN_INSTALLATION ; then + + su ${HTTP_USER} -s /bin/bash -c "cd ${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION} && \ + php /usr/local/bin/composer config --json \ + policy.advisories.ignore-id '[\"PKSA-qv5y-crcz-9nxw\",\"PKSA-kbc7-dq62-pt7d\"]'" \ + > $log_file 2>&1 + + + else + + su ${HTTP_USER} -s /bin/bash -c "cd ${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION} && \ + /usr/local/php-${php_latest_ver}/bin/php /usr/local/bin/composer config --json \ + policy.advisories.ignore-id '[\"PKSA-qv5y-crcz-9nxw\",\"PKSA-kbc7-dq62-pt7d\"]'" \ + > $log_file 2>&1 + + fi + + if [[ $? -eq 0 ]]; then + echo_ok + else + echo_failed + + echo "" + echo -e "\tCommand was: " + if $PHP_DEBIAN_INSTALLATION ; then + cat < $log_file 2>&1 +EOF + else + cat < $log_file 2>&1 +EOF + fi + echo "" + + error "$(cat $log_file)" + + echononl "\tcontinue anyway [yes/no]: " + read OK + OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')" + while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do + echononl "Wrong entry! - repeat [yes/nno]: " + read OK + done + [[ $OK = "yes" ]] || fatal "Script terminated by user input.." + fi +fi + + echononl "\tInstall PHP dependencies ( composer install --no-dev ... ).." if [[ ${PF_ADMIN_MAJOR_VERSION} -gt 3 ]] ; then if $PHP_DEBIAN_INSTALLATION ; then - su ${HTTP_USER} -c"cd ${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION} + su ${HTTP_USER} -c"cd ${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION} && \ php /usr/local/bin/composer install --prefer-dist --no-interaction --no-dev" -s /bin/bash \ > $log_file 2>&1 else - su ${HTTP_USER} -c"cd ${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION} + su ${HTTP_USER} -c"cd ${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION} && \ /usr/local/php-${php_latest_ver}/bin/php /usr/local/bin/composer --prefer-dist \ --no-interaction install --no-dev" -s /bin/bash > $log_file 2>&1 fi if [[ $? -eq 0 ]]; then - echo_ok + echo_ok else echo_failed + + echo "" + echo -e "\tCommand was: " + if $PHP_DEBIAN_INSTALLATION ; then + cat < $log_file 2>&1 +EOF + else + cat < $log_file 2>&1 +EOF + fi + echo "" + error "$(cat $log_file)" echononl "\tcontinue anyway [yes/no]: "