Dropped PHP7.1 support and install composer

README.md

@@ -23,8 +23,7 @@ To get the latest tor version, you should follow these instructions to add the o
 
 The following command will install all required packages:
 ```
-apt-get --no-install-recommends install apt-transport-tor aspell clamav-daemon clamav-freshclam clamav-milter curl dovecot-imapd dovecot-pop3d git dnsmasq haveged hunspell iptables locales-all logrotate mariadb-server nginx-light postfix postfix-mysql \
+apt-get --no-install-recommends install apt-transport-tor aspell clamav-daemon clamav-freshclam clamav-milter composer curl dovecot-imapd dovecot-pop3d git dnsmasq haveged hunspell iptables locales-all logrotate mariadb-server nginx-light postfix postfix-mysql \
-php7.1-bcmath php7.1-bz2 php7.1-cli php7.1-curl php7.1-dba php7.1-enchant php7.1-fpm php7.1-gd php7.1-gmp php7.1-imap php7.1-intl php7.1-json php7.1-mbstring php7.1-mcrypt php7.1-mysql php7.1-opcache php7.1-pspell php7.1-readline php7.1-recode php7.1-soap php7.1-sqlite3 php7.1-tidy php7.1-xml php7.1-xmlrpc php7.1-xsl php7.1-zip \
 php7.2-bcmath php7.2-bz2 php7.2-cli php7.2-curl php7.2-dba php7.2-enchant php7.2-fpm php7.2-gd php7.2-gmp php7.2-imap php7.2-intl php7.2-json php7.2-mbstring php7.2-mysql php7.2-opcache php7.2-pspell php7.2-readline php7.2-recode php7.2-soap php7.2-sqlite3 php7.2-tidy php7.2-xml php7.2-xmlrpc php7.2-xsl php7.2-zip \
 php7.3-bcmath php7.3-bz2 php7.3-cli php7.3-curl php7.3-dba php7.3-enchant php7.3-fpm php7.3-gd php7.3-gmp php7.3-imap php7.3-intl php7.3-json php7.3-mbstring php7.3-mysql php7.3-opcache php7.3-pspell php7.3-readline php7.3-recode php7.3-soap php7.3-sqlite3 php7.3-tidy php7.3-xml php7.3-xmlrpc php7.3-xsl php7.3-zip \
 phpmyadmin php-apcu php-gnupg php-imagick sasl2-bin ssh subversion tor vsftpd && apt-get --no-install-recommends install adminer
@@ -103,7 +102,7 @@ As time syncronisation is important, you should configure ntp servers in /etc/sy
 To create all required tor and php instances run the following commands:
 ```
 for instance in 2 3 4 5 6 7 a b c d e f g h i j k l m n o p q r s t u v w x y z; do(tor-instance-create $instance) done
-for instance in default 2 3 4 5 6 7 a b c d e f g h i j k l m n o p q r s t u v w x y z; do(systemctl enable php7.1-fpm@$instance; systemctl enable php7.2-fpm@$instance; systemctl enable php7.3-fpm@$instance;) done
+for instance in default 2 3 4 5 6 7 a b c d e f g h i j k l m n o p q r s t u v w x y z; do(systemctl enable php7.2-fpm@$instance; systemctl enable php7.3-fpm@$instance;) done
 ```
 
 For web based mail management grab the latest squirrelmail and install it in /var/www/html/squirrelmail:

etc/logrotate.d/php7.1-fpm

@@ -1,11 +0,0 @@
-/var/log/php7.1-fpm*.log {
-	rotate 1
-	daily
-	missingok
-	notifempty
-	compress
-	delaycompress
-	postrotate
-		/usr/lib/php/php7.1-fpm-reopenlogs
-	endscript
-}

etc/systemd/system/php7.1-fpm.service

@@ -1,17 +0,0 @@
-# This service is actually a systemd target,
-# but we are using a service since targets cannot be reloaded.
-
-[Unit]
-Description=The PHP 7.1 FastCGI Process Manager (multi instance master)
-Documentation=man:php-fpm7.1(8)
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/true
-ExecReload=/bin/true
-
-[Install]
-WantedBy=multi-user.target
-

etc/systemd/system/php7.1-fpm@.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=The PHP 7.1 FastCGI Process Manager (instance %i)
-Documentation=man:php-fpm7.1(8)
-After=network.target
-PartOf=php7.1-fpm.service
-ReloadPropagatedFrom=php7.1-fpm.service
-
-[Service] 
-Type=notify
-PIDFile=/run/php/php7.1-fpm-%i.pid
-ExecStart=/usr/sbin/php-fpm7.1 --nodaemonize --fpm-config /etc/php/7.1/fpm/php-fpm-%i.conf
-ExecReload=/bin/kill -USR2 $MAINPID
-LimitNOFILE=100000
-TimeoutStartSec=300
-
-[Install]
-WantedBy=multi-user.target

etc/systemd/system/php7.1-fpm@default.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=The PHP 7.1 FastCGI Process Manager
-Documentation=man:php-fpm7.1(8)
-After=network.target
-PartOf=php7.1-fpm.service
-ReloadPropagatedFrom=php7.1-fpm.service
-
-[Service] 
-Type=notify
-PIDFile=/run/php/php7.1-fpm.pid
-ExecStart=/usr/sbin/php-fpm7.1 --nodaemonize --fpm-config /etc/php/7.1/fpm/php-fpm.conf
-ExecReload=/bin/kill -USR2 $MAINPID
-LimitNOFILE=100000
-TimeoutStartSec=300
-
-[Install]
-WantedBy=multi-user.target

var/www/common.php

@@ -20,7 +20,7 @@ const REQUIRE_APPROVAL=false; //require admin approval of new sites? true/false
 const ADMIN_PASSWORD='MY_PASSWORD'; //password for admin interface
 const SERVICE_INSTANCES=['2', '3', '4', '5', '6', '7', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'];
 const DISABLED_PHP_VERSIONS=[];
-const PHP_VERSIONS=[2 => '7.1', 3 => '7.2', 4 => '7.3'];
+const PHP_VERSIONS=[3 => '7.2', 4 => '7.3'];
 const PHP_CONFIG='memory_limit = 256M
 error_reporting = E_ALL
 post_max_size = 10G