Przeglądaj źródła

Add php-imagick by default and install it on existing systems.

Raphael Schneeberger 6 lat temu
rodzic
commit
d498043625

+ 8 - 6
install/hst-install-debian.sh

@@ -31,7 +31,7 @@ if [ "$release" -eq 8 ]; then
         apache2-suexec-custom libapache2-mod-ruid2
         libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi
         php5-mysql php5-curl php5-pgsql awstats vsftpd net-tools
-        proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
+        php5-imagick proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon
         spamassassin dovecot-imapd dovecot-pop3d roundcube-core
         roundcube-mysql roundcube-plugins mariadb-client mariadb-common
         mariadb-server postgresql postgresql-contrib phppgadmin phpMyAdmin mc
@@ -43,7 +43,7 @@ elif [ "$release" -eq 9 ]; then
     software="nginx apache2 apache2-utils apache2-suexec-custom
         libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php php
         php-common php-cgi php-mysql php-curl php-pgsql php-imap php-ldap php-apcu
-        awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy 
+        php-imagick awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy 
         clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
         roundcube-mysql roundcube-plugins mariadb-client mariadb-common
         mariadb-server postgresql postgresql-contrib phppgadmin phpmyadmin mc
@@ -55,7 +55,7 @@ else
     software="nginx apache2 apache2-utils apache2-suexec-custom
         apache2-suexec-pristine libapache2-mod-fcgid libapache2-mod-php php
         php-common php-cgi php-mysql php-curl php-pgsql php-imap php-ldap php-apcu
-        awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy 
+        php-imagick awstats vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy 
         clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core net-tools
         roundcube-mysql roundcube-plugins mariadb-client mariadb-common
         mariadb-server postgresql postgresql-contrib phpmyadmin phppgadmin mc
@@ -725,7 +725,7 @@ if [ "$multiphp" = 'yes' ]; then
         fi
         mph="php$v-mbstring php$v-bcmath php$v-cli php$v-curl php$v-fpm
              php$v-gd php$v-intl php$v-mysql php$v-soap php$v-xml php$v-zip
-             php$v-mbstring php$v-json php$v-bz2 php$v-pspell"
+             php$v-mbstring php$v-json php$v-bz2 php$v-pspell php$v-imagick"
         # Check is version is 7.1 or below to add mcrypt
         if [[ `echo "$v 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then 
             mph="$mph php$v-mcrypt"
@@ -736,7 +736,8 @@ if [ "$multiphp" = 'yes' ]; then
         fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
              php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
              php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
-             php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
+             php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell
+             php$fpm_v-imagick"
         software="$software $fpm"
         multiphp+=("$fpm_v")
     fi
@@ -746,7 +747,8 @@ if [ "$phpfpm" = 'yes' ]; then
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
-         php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
+         php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell
+         php$fpm_v-imagick"
     software="$software $fpm"
 fi
 

+ 6 - 4
install/hst-install-ubuntu.sh

@@ -31,7 +31,7 @@ software="apache2 apache2.2-common apache2-suexec-custom apache2-utils
     apparmor-utils awstats bc bind9 bsdmainutils bsdutils clamav-daemon
     cron curl dnsutils dovecot-imapd dovecot-pop3d e2fslibs e2fsprogs exim4
     exim4-daemon-heavy expect fail2ban flex ftp git idn imagemagick
-    libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf
+    libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf php-imagick
     libapache2-mod-ruid2 lsof mc mariadb-client mariadb-common mariadb-server nginx
     ntpdate php php-cgi php-common php-curl phpmyadmin php-mysql php-imap php-ldap
     php-apcu phppgadmin php-pgsql postgresql postgresql-contrib proftpd-basic quota
@@ -678,7 +678,7 @@ if [ "$multiphp" = 'yes' ]; then
         fi
         mph="php$v-mbstring php$v-bcmath php$v-cli php$v-curl php$v-fpm
              php$v-gd php$v-intl php$v-mysql php$v-soap php$v-xml php$v-zip
-             php$v-mbstring php$v-json php$v-bz2 php$v-pspell"
+             php$v-mbstring php$v-json php$v-bz2 php$v-pspell php$v-imagick"
         # Check is version is 7.1 or below to add mcrypt
         if [[ `echo "$v 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
             mph="$mph php$v-mcrypt"
@@ -689,7 +689,8 @@ if [ "$multiphp" = 'yes' ]; then
         fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
              php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
              php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
-             php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
+             php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell
+             php$fpm_v-imagick"
         software="$software $fpm"
         multiphp+=("$fpm_v")
     fi
@@ -699,7 +700,8 @@ if [ "$phpfpm" = 'yes' ]; then
     fpm="php$fpm_v php$fpm_v-common php$fpm_v-bcmath php$fpm_v-cli
          php$fpm_v-curl php$fpm_v-fpm php$fpm_v-gd php$fpm_v-intl
          php$fpm_v-mysql php$fpm_v-soap php$fpm_v-xml php$fpm_v-zip
-         php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell"
+         php$fpm_v-mbstring php$fpm_v-json php$fpm_v-bz2 php$fpm_v-pspell
+         php$fpm_v-imagick"
     software="$software $fpm"
 fi
 

+ 14 - 0
install/upgrade/versions/previous/1.0.4.sh

@@ -6,3 +6,17 @@
 #######                      Place additional commands below.                   #######
 #######################################################################################
 
+# Add php-imagick package to existing version...
+php_versions=$(ls /etc/php/*/fpm -d 2>/dev/null |wc -l)
+if [ "$php_versions" -gt 1 ]; then
+    echo "(*) Install PHP Imageqick..."
+    software="php-imagick"
+    for v in $(ls /etc/php/); do
+        if [ ! -d "/etc/php/$v/fpm/pool.d/" ]; then
+            continue
+        fi
+        software="$software php$v-imagick"
+    done
+fi
+apt -qq update
+apt -qq install $software -y