Skip to content

Commit

Permalink
Merge pull request #106 from saygoweb/pr/debian-buster
Browse files Browse the repository at this point in the history 
Several fixes for debian-buster
  • Loading branch information
@nuxwin
nuxwin committed Jun 22, 2021
2 parents eba47c0 + 0de6cf4 commit 1167f90
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 7 deletions.
1 change: 1 addition & 0 deletions autoinstaller/Adapter/managed_services.txt
View file
Expand Up @@ -13,6 +13,7 @@ php7.1-fpm
php7.2-fpm
php7.3-fpm
php7.4-fpm
php8.0-fpm
postfix
proftpd
vsftpd
49 changes: 46 additions & 3 deletions autoinstaller/Packages/debian-buster.xml
View file
Expand Up @@ -157,6 +157,8 @@
<package>php7.0-xml</package>
<package>php7.0-zip</package>
<package>libapache2-mod-php7.0</package>
<package>php7.0-apcu</package>
<package>php7.0-apcu-bc</package>
</php7.0>
<php7.1
always_installed="1"
Expand Down Expand Up @@ -195,6 +197,8 @@
<package>php7.1-xml</package>
<package>php7.1-zip</package>
<package>libapache2-mod-php7.1</package>
<package>php7.1-apcu</package>
<package>php7.1-apcu-bc</package>
</php7.1>
<php7.2
always_installed="1"
Expand Down Expand Up @@ -232,6 +236,8 @@
<package>php7.2-xml</package>
<package>php7.2-zip</package>
<package>libapache2-mod-php7.2</package>
<package>php7.2-apcu</package>
<package>php7.2-apcu-bc</package>
</php7.2>
<php7.3
always_installed="1"
Expand Down Expand Up @@ -285,6 +291,8 @@
<package>php7.3-xml</package>
<package>php7.3-zip</package>
<package>libapache2-mod-php7.3</package>
<package>php7.3-apcu</package>
<package>php7.3-apcu-bc</package>
</php7.3>
<php7.4
always_installed="1"
Expand Down Expand Up @@ -322,9 +330,45 @@
<package>php7.4-xml</package>
<package>php7.4-zip</package>
<package>libapache2-mod-php7.4</package>
<package>php7.4-apcu</package>
<package>php7.4-apcu-bc</package>
</php7.4>
<package>php-apcu</package>
<package>php-apcu-bc</package>
<php8.0
always_installed="1"
class="Servers::php"
description="PHP 8.0"
>
<package
post_install_tasks="
/usr/sbin/phpenmod -v 8.0 -s ALL ctype fileinfo ftp
gettext iconv pdo phar posix sockets bcmath bz2 curl gd
gmp imap intl json mbstring mysqlnd mysqli pdo_mysql
opcache pspell dom xml xmlreader xmlwriter zip apcu
"
>
php8.0
</package>
<package>php8.0-cli</package>
<package>php8.0-cgi</package>
<package>php8.0-fpm</package>
<package>php8.0-common</package>
<package>php8.0-bcmath</package>
<package>php8.0-bz2</package>
<package>php8.0-curl</package>
<package>php8.0-gd</package>
<package>php8.0-gmp</package>
<package>php8.0-imap</package>
<package>php8.0-intl</package>
<package>php8.0-mbstring</package>
<package>php8.0-mysql</package>
<package>php8.0-opcache</package>
<package>php8.0-phar</package>
<package>php8.0-pspell</package>
<package>php8.0-xml</package>
<package>php8.0-zip</package>
<package>libapache2-mod-php8.0</package>
<package>php8.0-apcu</package>
</php8.0>
<package>php-pear</package>
</php>
<po
Expand Down Expand Up @@ -489,7 +533,6 @@
<package>libdatetime-perl</package>
<package>libdbd-mariadb-perl</package>
<package>libdbi-perl</package>
<package>libdigest-md5-perl</package>
<package>libemail-valid-perl</package>
<package>libfile-chmod-perl</package>
<package>libfile-copy-recursive-perl</package>
Expand Down
2 changes: 1 addition & 1 deletion engine/PerlLib/Package/ServicesSSL.pm
View file
Expand Up @@ -84,7 +84,7 @@ sub registerSetupListeners

sub preinstall
{
my $sslEnabled = ::setupGetQuestion( 'SERVICE_SSL_ENABLED' );
my $sslEnabled = ::setupGetQuestion( 'SERVICES_SSL_ENABLED' );

# SSL is disabled. We need remove the SSL certificate if any and
# return early
Expand Down
2 changes: 1 addition & 1 deletion engine/PerlLib/Package/WebmailClients/Roundcube/Roundcube.pm
View file
Expand Up @@ -43,7 +43,7 @@ use subs qw/
/;

my $packageVersionConstraint = $ENV{'IMSCP_PKG_DEVELOPMENT'}
? '1.3.x-dev' : '^1.0';
? '1.3.x-dev' : '1.3.x-dev';

=head1 DESCRIPTION
Expand Down
3 changes: 2 additions & 1 deletion engine/PerlLib/Servers/httpd/apache_fcgid/installer.pm
View file
Expand Up @@ -432,7 +432,7 @@ sub _buildFastCgiConfFiles
$rs = $self->{'httpd'}->disableModules(
'actions', 'fastcgi', 'fcgid', 'fcgid_imscp', 'php5', 'php5_cgi',
'php5filter',
'php5.6', 'php7.0', 'php7.1', 'php7.2', 'php7.3', 'php7.4',
'php5.6', 'php7.0', 'php7.1', 'php7.2', 'php7.3', 'php7.4', 'php8.0'
'proxy_fcgi', 'proxy_handler', 'mpm_itk', 'mpm_event', 'mpm_prefork',
'mpm_worker'
);
Expand Down Expand Up @@ -532,6 +532,7 @@ sub _buildApacheConfFiles
'php7.2-cgi.conf', 'php7.2-fpm.conf',
'php7.3-cgi.conf', 'php7.3-fpm.conf',
'php7.4-cgi.conf', 'php7.4-fpm.conf',
'php8.0-cgi.conf', 'php8.0-fpm.conf',
'serve-cgi-bin.conf'
);
$rs ||= $self->{'httpd'}->disableSites(
Expand Down
3 changes: 2 additions & 1 deletion engine/PerlLib/Servers/httpd/apache_php_fpm/installer.pm
View file
Expand Up @@ -446,7 +446,7 @@ sub _buildFastCgiConfFiles
$rs = $self->{'httpd'}->disableModules(
'actions', 'fastcgi', 'fcgid', 'fcgid_imscp', 'suexec',
'php5', 'php5_cgi', 'php5filter',
'php5.6', 'php7.0', 'php7.1', 'php7.2', 'php7.3', 'php7.4',
'php5.6', 'php7.0', 'php7.1', 'php7.2', 'php7.3', 'php7.4', 'php8.0',
'proxy_fcgi', 'proxy_handler', 'mpm_itk', 'mpm_event', 'mpm_prefork',
'mpm_worker'
);
Expand Down Expand Up @@ -589,6 +589,7 @@ sub _buildApacheConfFiles
'php7.2-cgi.conf', 'php7.2-fpm.conf',
'php7.3-cgi.conf', 'php7.3-fpm.conf',
'php7.4-cgi.conf', 'php7.4-fpm.conf',
'php8.0-cgi.conf', 'php8.0-fpm.conf',
'serve-cgi-bin.conf'
);
$rs ||= $self->{'httpd'}->disableSites(
Expand Down

0 comments on commit 1167f90

Please sign in to comment.