Skip to content

Commit

Permalink
small fix
Browse files Browse the repository at this point in the history
php fix for one last split package from ondrej ppa.
  • Loading branch information
QROkes committed Oct 18, 2020
1 parent ef798f5 commit 8bfab58
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
7 changes: 4 additions & 3 deletions lib/install
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,10 @@ php_optim() {
sudo sed -i '/ping.path =/c\ping.path = /ping' /etc/php/$ver/fpm/pool.d/www.conf

if [[ $(conf_read multi-php) == "true" ]]; then
[[ $ver == 8.0 ]] && sudo sed -i '/listen = /c\listen = 127.0.0.1:9001' /etc/php/$ver/fpm/pool.d/www.conf
[[ $ver == 7.4 ]] && sudo sed -i '/listen = /c\listen = 127.0.0.1:9000' /etc/php/$ver/fpm/pool.d/www.conf
[[ $ver == 7.3 ]] && sudo sed -i '/listen = /c\listen = 127.0.0.1:9001' /etc/php/$ver/fpm/pool.d/www.conf
[[ $ver == 7.2 ]] && sudo sed -i '/listen = /c\listen = 127.0.0.1:9002' /etc/php/$ver/fpm/pool.d/www.conf
[[ $ver == 7.3 ]] && sudo sed -i '/listen = /c\listen = 127.0.0.1:9002' /etc/php/$ver/fpm/pool.d/www.conf
[[ $ver == 7.2 ]] && sudo sed -i '/listen = /c\listen = 127.0.0.1:9003' /etc/php/$ver/fpm/pool.d/www.conf
else
sudo sed -i '/listen = /c\listen = 127.0.0.1:9000' /etc/php/$ver/fpm/pool.d/www.conf
fi
Expand Down Expand Up @@ -457,7 +458,7 @@ php_tool() {
sudo systemctl enable redis-server

# Memcached (Object Cache)
sudo apt -y install php${ver}-memcached php-memcache memcached
sudo apt -y install php${ver}-memcached php${ver}-memcache memcached

# Postfix mail
echo "postfix postfix/main_mailer_type select Internet Site" | debconf-set-selections
Expand Down
5 changes: 3 additions & 2 deletions plugins/stack
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@ elif [[ -n $purge && -n $php ]]; then

sudo apt -y purge php${ver}-common php${ver}-cli php${ver}-fpm php${ver}-curl php${ver}-gd php${ver}-imap php${ver}-readline php${ver}-mysql php${ver}-mbstring php${ver}-bcmath php${ver}-mysql php${ver}-opcache php${ver}-zip php${ver}-xml php${ver}-soap php${ver}-imagick php${ver}-msgpack php${ver}-igbinary graphviz php-pear

sudo apt -y purge php${ver}-memcached php-memcache memcached
sudo apt -y purge php${ver}-memcached php${ver}-memcache memcached
sudo apt -y purge redis-server php${ver}-redis postfix

# For old packages - before ondrej split modules
sudo apt -y purge php-memcached php-imagick php-msgpack php-redis
sudo apt -y purge php-memcached php-memcache php-imagick php-msgpack php-redis

echo | sudo add-apt-repository --remove 'ppa:ondrej/php'
echo | sudo add-apt-repository --remove 'ppa:chris-lea/redis-server'
Expand All @@ -159,6 +159,7 @@ elif [[ -n $purge && -n $php ]]; then

conf_write php purged
conf_write php-optim purged
[[ $(conf_read php-v8.0) == "true" ]] && conf_write php-v8.0 purged
[[ $(conf_read php-v7.4) == "true" ]] && conf_write php-v7.4 purged
[[ $(conf_read php-v7.3) == "true" ]] && conf_write php-v7.3 purged
[[ $(conf_read php-v7.2) == "true" ]] && conf_write php-v7.2 purged
Expand Down

0 comments on commit 8bfab58

Please sign in to comment.