Skip to content

Add ubuntu focal support #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 22 commits into
base: 1.5.3-maintenance
Choose a base branch
from
Open

Add ubuntu focal support #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fa57138
Revert "Revert "Fixed problem with stopping php8.0-fpm on installatio…
fluser Dec 18, 2020
feb1a80
Added ubuntu 20.04
fluser Dec 21, 2020
c3fad78
Added base version of packages
fluser Dec 21, 2020
907b2de
Fixed libssl detection for ubuntu focal
fluser Dec 21, 2020
77d3fba
Added php8.0-fpm to managed_services
fluser Dec 21, 2020
16f9f47
Added separate bind data files
fluser Dec 21, 2020
65aefcb
Updated docs
fluser Dec 21, 2020
d275709
Merge branch 'add-ubuntu20.04-vagrant' into add-ubuntu-focal-support
fluser Dec 21, 2020
a36118f
Removed obsolete files
fluser Dec 21, 2020
130a2d9
Fixed problem with changed service name under ubuntu focal
fluser Dec 21, 2020
cba842a
Fixed missing php8.0 references
fluser Dec 21, 2020
565e179
Updated preseed file with new php versions
fluser Dec 22, 2020
1e79590
Added missing php modules
fluser Dec 22, 2020
ba758f9
Added upstart overrides for php7.4-frpm and php8.0-fpm
fluser Dec 22, 2020
b930308
Fixes boot problem on Debian 10 - boot after kernel update not possi…
fluser Dec 22, 2020
69d6717
Removed obsolete php5 code
fluser Dec 22, 2020
7cda15e
Fixed libssl detection for Ubuntu Xenial
fluser Dec 23, 2020
f184a00
Removed linux-headers-generic again
fluser Dec 23, 2020
12635fe
Fixed plugin installation, activation, deactivation and removal
fluser Dec 23, 2020
4ee0985
Removed unnecessary whitespaces
fluser Dec 23, 2020
fc39d41
Merge branch 'fix-plugin-management' into add-ubuntu-focal-support
fluser Dec 23, 2020
311250c
Fixed case when grub is not installed properly on Debian
fluser Dec 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Vagrant/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ The following Vagrant boxes are made available
- Debian 10.x (Buster): `imscp_debian_buster` (VirtualBox, LXC)
- Ubuntu 16.04 (Xenial Xerus): `imscp_ubuntu_xenial` (VirtualBox only)
- Ubuntu 18.04 (Bionic Beaver): `imscp_ubuntu_bionic` (VirtualBox only)
- Ubuntu 20.04 (Focal Fossa): `imscp_ubuntu_focal` (VirtualBox only)

## Getting started

Expand Down
42 changes: 28 additions & 14 deletions Vagrant/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,34 @@ Vagrant.configure("2") do |config|
]
end
end

# Ubuntu Bionic Beaver (18.04)
config.vm.define "imscp_ubuntu_bionic", autostart: false do |node|
node.vm.box = "bento/ubuntu-18.04"

# VirtualBox provider configuration
node.vm.provider :virtualbox do |vb|
vb.customize ["modifyvm", :id,
"--memory", "1024",
"--name", "imscp_ubuntu_bionic",
#"--natdnshostresolver1", "on"
]
end
end

# Ubuntu Bionic Beaver (18.04)
config.vm.define "imscp_ubuntu_bionic", autostart: false do |node|
node.vm.box = "bento/ubuntu-18.04"

# VirtualBox provider configuration
node.vm.provider :virtualbox do |vb|
vb.customize ["modifyvm", :id,
"--memory", "1024",
"--name", "imscp_ubuntu_bionic",
#"--natdnshostresolver1", "on"
]
end
end

# Ubuntu Focal Fossa (20.04)
config.vm.define "imscp_ubuntu_focal", autostart: false do |node|
node.vm.box = "bento/ubuntu-20.04"

# VirtualBox provider configuration
node.vm.provider :virtualbox do |vb|
vb.customize ["modifyvm", :id,
"--memory", "1024",
"--name", "imscp_ubuntu_focal",
#"--natdnshostresolver1", "on"
]
end
end

## Vagrant box upgrade

Expand Down
19 changes: 17 additions & 2 deletions Vagrant/scripts/distro_update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# i-MSCP - internet Multi Server Control Panel
# Copyright 2010-2019 by Laurent Declercq <[email protected]>
#
Expand All @@ -21,6 +21,21 @@ export LANG=C.UTF-8
# some Vagrant boxes
dpkg --remove-architecture i386 2>/dev/null

. /etc/os-release

if [ "$ID" == 'debian' ] ; then
# Fix problem with grub installation
echo "set grub-pc/install_devices $(grub-probe -t device /boot/grub)" | debconf-communicate
fi

apt-get update
apt-get --assume-yes dist-upgrade
apt-get --assume-yes install ca-certificates perl
apt-get --assume-yes install \
ca-certificates \
perl \
virt-what

# Fix problem with Debian Buster (Grub not cleanly installed)
if virt-what | grep virtualbox &> /dev/null ; then
grub-install /dev/sda
fi
1 change: 1 addition & 0 deletions autoinstaller/Adapter/managed_services.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ php7.1-fpm
php7.2-fpm
php7.3-fpm
php7.4-fpm
php8.0-fpm
postfix
proftpd
vsftpd
36 changes: 36 additions & 0 deletions autoinstaller/Packages/debian-buster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,42 @@
<package>php7.4-zip</package>
<package>libapache2-mod-php7.4</package>
</php7.4>
<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
apcu_bc
"
>
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>
</php8.0>
<package>php-apcu</package>
<package>php-apcu-bc</package>
<package>php-pear</package>
Expand Down
36 changes: 36 additions & 0 deletions autoinstaller/Packages/debian-stretch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,42 @@
<package>php7.4-zip</package>
<package>libapache2-mod-php7.4</package>
</php7.4>
<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
apcu_bc
"
>
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>
</php8.0>
<package>php-apcu</package>
<package>php-apcu-bc</package>
<package>php-pear</package>
Expand Down
36 changes: 36 additions & 0 deletions autoinstaller/Packages/devuan-ascii.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,42 @@
<package>php7.4-zip</package>
<package>libapache2-mod-php7.4</package>
</php7.4>
<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
apcu_bc
"
>
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>
</php8.0>
<package>php-apcu</package>
<package>php-apcu-bc</package>
<package>php-pear</package>
Expand Down
36 changes: 36 additions & 0 deletions autoinstaller/Packages/ubuntu-bionic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,42 @@
<package>php7.4-zip</package>
<package>libapache2-mod-php7.4</package>
</php7.4>
<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
apcu_bc
"
>
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>
</php8.0>
<package>php-apcu</package>
<package>php-apcu-bc</package>
<package>php-pear</package>
Expand Down
Loading