Add support for Buster in the installer
This commit is contained in:
parent
a1c2d7b695
commit
a414bc3418
|
@ -59,6 +59,12 @@ Vagrant.configure("2") do |config|
|
||||||
os.vm.box = "bento/debian-9.6"
|
os.vm.box = "bento/debian-9.6"
|
||||||
provision_libretime(os, "debian.sh", installer_args)
|
provision_libretime(os, "debian.sh", installer_args)
|
||||||
end
|
end
|
||||||
|
config.vm.define "debian-buster" do |os|
|
||||||
|
# TODO: Replace with generic/debian10 once it is released
|
||||||
|
os.vm.box = "fujimakishouten/debian-buster64"
|
||||||
|
# TODO: Remove the manual flags after buster is released
|
||||||
|
provision_libretime(os, "debian.sh", installer_args + "--distribution=debian --release=buster")
|
||||||
|
end
|
||||||
config.vm.define "centos" do |os|
|
config.vm.define "centos" do |os|
|
||||||
os.vm.box = 'centos/7'
|
os.vm.box = 'centos/7'
|
||||||
provision_libretime(os, "centos.sh", installer_args + "--selinux")
|
provision_libretime(os, "centos.sh", installer_args + "--selinux")
|
||||||
|
|
25
install
25
install
|
@ -147,11 +147,18 @@ function systemInitDetect() {
|
||||||
# Get the path of the command where pid=1 following any symlinks
|
# Get the path of the command where pid=1 following any symlinks
|
||||||
pid_1_path=$(readlink --canonicalize -n /proc/1/exe)
|
pid_1_path=$(readlink --canonicalize -n /proc/1/exe)
|
||||||
# returns '/sbin/init' (Debian Wheezy & Ubuntu Trusty)
|
# returns '/sbin/init' (Debian Wheezy & Ubuntu Trusty)
|
||||||
# returns '(/usr)?/lib/systemd/systemd' (Debian Stretch, Debian Jessie, Ubuntu Xenial, CentOS 7)
|
# returns '(/usr)?/lib/systemd/systemd' (Debian Stretch, Debian Jessie, Debian Buster, Ubuntu Xenial, CentOS 7)
|
||||||
verbose "Detected path to PID=1 process: $pid_1_path"
|
verbose "Detected path to PID=1 process: $pid_1_path"
|
||||||
# Get package of PID=1 path as it identifies the init system
|
# Get package of PID=1 path as it identifies the init system
|
||||||
pid_1_package=$(dpkg -S $pid_1_path 2>/dev/null ||
|
if $if_debian_buster; then
|
||||||
rpm --qf '%{name}\n' -qf $pid_1_path 2>/dev/null)
|
# /usr/lib/systemd/systemd is provided by the base system in Debian Buster, so
|
||||||
|
# dpkg -S /usr/lib/systemd returns an error - no path found matching pattern
|
||||||
|
# This is a work around to avoid failing on package detection
|
||||||
|
pid_1_package=systemd
|
||||||
|
else
|
||||||
|
pid_1_package=$(dpkg -S $pid_1_path 2>/dev/null ||
|
||||||
|
rpm --qf '%{name}\n' -qf $pid_1_path 2>/dev/null)
|
||||||
|
fi
|
||||||
verbose "Detected package name for PID=1 process: $pid_1_package"
|
verbose "Detected package name for PID=1 process: $pid_1_package"
|
||||||
case "${pid_1_package-$pid_1_path}" in
|
case "${pid_1_package-$pid_1_path}" in
|
||||||
*systemd*) has_systemd_init=true; verbose "Detected init system type: systemd" ;;
|
*systemd*) has_systemd_init=true; verbose "Detected init system type: systemd" ;;
|
||||||
|
@ -584,6 +591,7 @@ fi
|
||||||
|
|
||||||
# Validate the distribution and release is a supported one; set boolean flags.
|
# Validate the distribution and release is a supported one; set boolean flags.
|
||||||
is_debian_dist=false
|
is_debian_dist=false
|
||||||
|
is_debian_buster=false
|
||||||
is_debian_stretch=false
|
is_debian_stretch=false
|
||||||
is_debian_jessie=false
|
is_debian_jessie=false
|
||||||
is_ubuntu_dist=false
|
is_ubuntu_dist=false
|
||||||
|
@ -621,6 +629,11 @@ case "${dist}-${code}" in
|
||||||
is_debian_dist=true
|
is_debian_dist=true
|
||||||
is_debian_stretch=true
|
is_debian_stretch=true
|
||||||
;;
|
;;
|
||||||
|
debian-10|debian-buster)
|
||||||
|
code="buster"
|
||||||
|
is_debian_dist=true
|
||||||
|
is_debian_buster=true
|
||||||
|
;;
|
||||||
#Fix for Raspbian 9 (stretch)
|
#Fix for Raspbian 9 (stretch)
|
||||||
raspbian-9|9)
|
raspbian-9|9)
|
||||||
code="stretch"
|
code="stretch"
|
||||||
|
@ -684,6 +697,7 @@ if [ "$ignore_dependencies" = "f" ]; then
|
||||||
apt_force_options="--allow-downgrades --allow-remove-essential --allow-change-held-packages"
|
apt_force_options="--allow-downgrades --allow-remove-essential --allow-change-held-packages"
|
||||||
# Get apt-get version by returning the 2nd parameter from the 1st line of output
|
# Get apt-get version by returning the 2nd parameter from the 1st line of output
|
||||||
apt_version=$(apt-get --version |awk 'NR == 1 { print $2 }')
|
apt_version=$(apt-get --version |awk 'NR == 1 { print $2 }')
|
||||||
|
# returns 1.8.0~alpha3 (Debian Buster)
|
||||||
# returns: 1.4.7 (Debian Stretch)
|
# returns: 1.4.7 (Debian Stretch)
|
||||||
# returns: 0.9.7.9 (Debian Wheezy)
|
# returns: 0.9.7.9 (Debian Wheezy)
|
||||||
# returns: 1.0.1ubuntu2 (Ubuntu Trusty)
|
# returns: 1.0.1ubuntu2 (Ubuntu Trusty)
|
||||||
|
@ -983,6 +997,7 @@ loud " * Configuring PHP in Apache * "
|
||||||
loud "-----------------------------------------------------"
|
loud "-----------------------------------------------------"
|
||||||
# Test common locations for php conf directory
|
# Test common locations for php conf directory
|
||||||
php_conf_dirs=(
|
php_conf_dirs=(
|
||||||
|
"/etc/php/7.3/apache2/conf.d" # Debian Buster
|
||||||
"/etc/php/7.2/apache2/conf.d" # Ubuntu Bionic
|
"/etc/php/7.2/apache2/conf.d" # Ubuntu Bionic
|
||||||
"/etc/php/7.0/apache2/conf.d" # Ubuntu Xenial
|
"/etc/php/7.0/apache2/conf.d" # Ubuntu Xenial
|
||||||
"/etc/php5/apache2/conf.d" # Debian Stretch, Debian Jessie, Ubuntu Trusty
|
"/etc/php5/apache2/conf.d" # Debian Stretch, Debian Jessie, Ubuntu Trusty
|
||||||
|
@ -1006,7 +1021,9 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Enable Apache modules
|
# Enable Apache modules
|
||||||
if $is_ubuntu_bionic; then
|
if $is_debian_buster; then
|
||||||
|
loudCmd "a2enmod rewrite php7.3"
|
||||||
|
elif $is_ubuntu_bionic; then
|
||||||
loudCmd "a2enmod rewrite php7.2"
|
loudCmd "a2enmod rewrite php7.2"
|
||||||
elif $is_ubuntu_xenial || $is_debian_stretch; then
|
elif $is_ubuntu_xenial || $is_debian_stretch; then
|
||||||
loudCmd "a2enmod rewrite php7.0"
|
loudCmd "a2enmod rewrite php7.0"
|
||||||
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
apache2
|
||||||
|
git
|
||||||
|
libapache2-mod-php7.3
|
||||||
|
php7.3
|
||||||
|
php7.3-dev
|
||||||
|
php7.3-bcmath
|
||||||
|
php7.3-mbstring
|
||||||
|
php-pear
|
||||||
|
php7.3-gd
|
||||||
|
php-amqplib
|
||||||
|
|
||||||
|
lsb-release
|
||||||
|
|
||||||
|
zip
|
||||||
|
unzip
|
||||||
|
|
||||||
|
rabbitmq-server
|
||||||
|
|
||||||
|
postgresql
|
||||||
|
postgresql-client
|
||||||
|
php7.3-pgsql
|
||||||
|
|
||||||
|
python
|
||||||
|
python-virtualenv
|
||||||
|
python-pip
|
||||||
|
|
||||||
|
libsoundtouch-ocaml
|
||||||
|
libtaglib-ocaml
|
||||||
|
libao-ocaml
|
||||||
|
libmad-ocaml
|
||||||
|
ecasound
|
||||||
|
libportaudio2
|
||||||
|
libsamplerate0
|
||||||
|
libvo-aacenc0
|
||||||
|
|
||||||
|
python-rgain
|
||||||
|
python-gst-1.0
|
||||||
|
gstreamer1.0-plugins-ugly
|
||||||
|
python-pika
|
||||||
|
|
||||||
|
patch
|
||||||
|
|
||||||
|
icecast2
|
||||||
|
|
||||||
|
curl
|
||||||
|
php7.3-curl
|
||||||
|
mpg123
|
||||||
|
|
||||||
|
libcamomile-ocaml-data
|
||||||
|
libpulse0
|
||||||
|
vorbis-tools
|
||||||
|
lsb-release
|
||||||
|
lsof
|
||||||
|
vorbisgain
|
||||||
|
flac
|
||||||
|
vorbis-tools
|
||||||
|
pwgen
|
||||||
|
libfaad2
|
||||||
|
php-apcu
|
||||||
|
|
||||||
|
lame
|
||||||
|
|
||||||
|
coreutils
|
||||||
|
|
||||||
|
liquidsoap
|
||||||
|
|
||||||
|
libopus0
|
||||||
|
|
||||||
|
systemd-sysv
|
Loading…
Reference in New Issue