Skip to content

Commit d498043

Browse files
committed
Add php-imagick by default and install it on existing systems.
1 parent 63a60d4 commit d498043

File tree

3 files changed

+28
-10
lines changed

3 files changed

+28
-10
lines changed

install/hst-install-debian.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if [ "$release" -eq 8 ]; then
3131
apache2-suexec-custom libapache2-mod-ruid2
3232
libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi
3333
php5-mysql php5-curl php5-pgsql awstats vsftpd net-tools
34-
proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
34+
php5-imagick proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
3535
spamassassin dovecot-imapd dovecot-pop3d roundcube-core
3636
roundcube-mysql roundcube-plugins mariadb-client mariadb-common
3737
mariadb-server postgresql postgresql-contrib phppgadmin phpMyAdmin mc
@@ -43,7 +43,7 @@ elif [ "$release" -eq 9 ]; then
4343
software="nginx apache2 apache2-utils apache2-suexec-custom
4444
libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php php
4545
php-common php-cgi php-mysql php-curl php-pgsql php-imap php-ldap php-apcu
46-
awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
46+
php-imagick awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
4747
clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
4848
roundcube-mysql roundcube-plugins mariadb-client mariadb-common
4949
mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
@@ -55,7 +55,7 @@ else
5555
software="nginx apache2 apache2-utils apache2-suexec-custom
5656
apache2-suexec-pristine libapache2-mod-fcgid libapache2-mod-php php
5757
php-common php-cgi php-mysql php-curl php-pgsql php-imap php-ldap php-apcu
58-
awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
58+
php-imagick awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy
5959
clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
6060
roundcube-mysql roundcube-plugins mariadb-client mariadb-common
6161
mariadb-server postgresql postgresql-contrib phpmyadmin phppgadmin mc
@@ -725,7 +725,7 @@ if [ "$multiphp" = 'yes' ]; then
725725
fi
726726
mph="php$v-mbstring php$v-bcmath php$v-cli php$v-curl php$v-fpm
727727
php$v-gd php$v-intl php$v-mysql php$v-soap php$v-xml php$v-zip
728-
php$v-mbstring php$v-json php$v-bz2 php$v-pspell"
728+
php$v-mbstring php$v-json php$v-bz2 php$v-pspell php$v-imagick"
729729
# Check is version is 7.1 or below to add mcrypt
730730
if [[ `echo "$v 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
731731
mph="$mph php$v-mcrypt"
@@ -736,7 +736,8 @@ if [ "$multiphp" = 'yes' ]; then
736736
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
737737
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
738738
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
739-
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
739+
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell
740+
php$fpm_v-imagick"
740741
software="$software $fpm"
741742
multiphp+=("$fpm_v")
742743
fi
@@ -746,7 +747,8 @@ if [ "$phpfpm" = 'yes' ]; then
746747
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
747748
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
748749
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
749-
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
750+
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell
751+
php$fpm_v-imagick"
750752
software="$software $fpm"
751753
fi
752754

install/hst-install-ubuntu.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
3131
apparmor-utils awstats bc bind9 bsdmainutils bsdutils clamav-daemon
3232
cron curl dnsutils dovecot-imapd dovecot-pop3d e2fslibs e2fsprogs exim4
3333
exim4-daemon-heavy expect fail2ban flex ftp git idn imagemagick
34-
libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf
34+
libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf php-imagick
3535
libapache2-mod-ruid2 lsof mc mariadb-client mariadb-common mariadb-server nginx
3636
ntpdate php php-cgi php-common php-curl phpmyadmin php-mysql php-imap php-ldap
3737
php-apcu phppgadmin php-pgsql postgresql postgresql-contrib proftpd-basic quota
@@ -678,7 +678,7 @@ if [ "$multiphp" = 'yes' ]; then
678678
fi
679679
mph="php$v-mbstring php$v-bcmath php$v-cli php$v-curl php$v-fpm
680680
php$v-gd php$v-intl php$v-mysql php$v-soap php$v-xml php$v-zip
681-
php$v-mbstring php$v-json php$v-bz2 php$v-pspell"
681+
php$v-mbstring php$v-json php$v-bz2 php$v-pspell php$v-imagick"
682682
# Check is version is 7.1 or below to add mcrypt
683683
if [[ `echo "$v 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
684684
mph="$mph php$v-mcrypt"
@@ -689,7 +689,8 @@ if [ "$multiphp" = 'yes' ]; then
689689
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
690690
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
691691
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
692-
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
692+
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell
693+
php$fpm_v-imagick"
693694
software="$software $fpm"
694695
multiphp+=("$fpm_v")
695696
fi
@@ -699,7 +700,8 @@ if [ "$phpfpm" = 'yes' ]; then
699700
fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
700701
php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
701702
php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
702-
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
703+
php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell
704+
php$fpm_v-imagick"
703705
software="$software $fpm"
704706
fi
705707

install/upgrade/versions/previous/1.0.4.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,17 @@
66
####### Place additional commands below. #######
77
#######################################################################################
88

9+
# Add php-imagick package to existing version...
10+
php_versions=$(ls /etc/php/*/fpm -d 2>/dev/null |wc -l)
11+
if [ "$php_versions" -gt 1 ]; then
12+
echo "(*) Install PHP Imageqick..."
13+
software="php-imagick"
14+
for v in $(ls /etc/php/); do
15+
if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
16+
continue
17+
fi
18+
software="$software php$v-imagick"
19+
done
20+
fi
21+
apt -qq update
22+
apt -qq install $software -y

0 commit comments

Comments
 (0)