paramecio/apache
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixers in manager_apache

Browse source
This commit is contained in:
Antonio de la Rosa 2025-05-17 18:21:04 +02:00
parent 8231aa715c
commit 592ad67719
5 changed files with 66 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

84
scripts/check_php.sh
View file

@ -164,47 +164,6 @@ if [ "$DISTRO" = 'debian' ] || [ "$DISTRO" = 'ubuntu' ]; then
fi
if [ -f "/usr/local/bin/composer" ]; then
echo "Updating composer..."
# need sudo for composer autoupdate
sudo /usr/local/bin/composer self-update
else
echo "Installing composer..."
EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
then
>&2 echo 'ERROR: Invalid installer checksum'
rm composer-setup.php
exit 1
fi
php composer-setup.php --quiet
RESULT=$?
rm composer-setup.php
sudo mv composer.phar /usr/local/bin/composer
if [ $RESULT -eq 0 ]; then
echo '{"error": 0, "status": 0, "progress": 100, "no_progress":0, "message": "Composer installed sucessfully..."}'
else
echo '{"error": 1, "status": 1, "progress": 100, "no_progress":0, "message": "Error: cannot install composer!"}'
exit 1
fi
fi
elif [ "$DISTRO" = 'rocky' ] || [ "$DISTRO" = 'almalinux' ] || [ "$DISTRO" = 'fedora' ]; then
@ -316,3 +275,46 @@ else
fi
echo "Installing composer..."
if [ -f "/usr/local/bin/composer" ]; then
echo "Updating composer..."
# need sudo for composer autoupdate
sudo /usr/local/bin/composer self-update
else
echo "Installing composer..."
EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
then
>&2 echo 'ERROR: Invalid installer checksum'
rm composer-setup.php
exit 1
fi
php composer-setup.php --quiet
RESULT=$?
rm composer-setup.php
sudo mv composer.phar /usr/local/bin/composer
if [ $RESULT -eq 0 ]; then
echo '{"error": 0, "status": 0, "progress": 100, "no_progress":0, "message": "Composer installed sucessfully..."}'
else
echo '{"error": 1, "status": 1, "progress": 100, "no_progress":0, "message": "Error: cannot install composer!"}'
exit 1
fi
fi

2
scripts/manage_apache.py
View file

@ -604,7 +604,7 @@ def manage():
json_return['error']=0
json_return['status']=0
json_return['progress']=100
json_return['message']='Cleaning certbot ssl certificate for the domain'
json_return['message']='Cleaning certbot ssl certificate for the domain...'
print(json.dumps(json_return))