From 6898c4dc8e66b12c00e3cfda250bb25ec9c4056e Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Fri, 12 Oct 2018 19:35:37 +0200 Subject: [PATCH] :package: (installer) add Ubuntu Bionic Beaver Vagrant box --- Vagrantfile | 6 ++ docs/vagrant.md | 15 ++-- install | 11 ++- installer/lib/requirements-debian-wheezy.apt | 66 --------------- installer/lib/requirements-ubuntu-bionic.apt | 83 +++++++++++++++++++ installer/lib/requirements-ubuntu-precise.apt | 1 - installer/lib/requirements-ubuntu-trusty.apt | 1 - installer/lib/requirements-ubuntu-xenial.apt | 2 - ...uirements-ubuntu-xenial_docker_minimal.apt | 2 - 9 files changed, 107 insertions(+), 80 deletions(-) delete mode 100644 installer/lib/requirements-debian-wheezy.apt create mode 100644 installer/lib/requirements-ubuntu-bionic.apt diff --git a/Vagrantfile b/Vagrantfile index 9ce6b01ed..f85987c79 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -38,11 +38,17 @@ Vagrant.configure("2") do |config| installer_args="--force --in-place --verbose --postgres --apache --icecast " # define all the OS boxes we support + config.vm.define "ubuntu-bionic" do |os| + os.vm.box = "bento/ubuntu-18.04" + provision_libretime(os, "ubuntu.sh", installer_args) + end config.vm.define "ubuntu-xenial" do |os| os.vm.box = "bento/ubuntu-16.04" provision_libretime(os, "ubuntu.sh", installer_args) end config.vm.define "ubuntu-trusty" do |os| + STDERR.puts 'WARNING: The "ubuntu-trusty" option is deprecated. Please migrate to "ubuntu-bionic".' + STDERR.puts os.vm.box = "bento/ubuntu-14.04" provision_libretime(os, "ubuntu.sh", installer_args) end diff --git a/docs/vagrant.md b/docs/vagrant.md index 5629deae2..8a3ba6568 100644 --- a/docs/vagrant.md +++ b/docs/vagrant.md @@ -20,24 +20,25 @@ To get started you clone the repo and run `vagrant up`. ```bash git clone https://github.com/libretime/libretime.git cd libretime -vagrant up ubuntu-trusty +vagrant up ubuntu-xenial ``` If everything works out, you will find LibreTime on [port 8080](http://localhost:8080), icecast on [port 8000](http://localhost:8000) and the docs on [port 8888](http://localhost:8888). -Once you reach the web setup GUI you can click through it using the default values. To connect to the vagrant machine you can run `vagrant ssh ubuntu-trusty` in the libretime directory. +Once you reach the web setup GUI you can click through it using the default values. To connect to the vagrant machine you can run `vagrant ssh ubuntu-xenial` in the libretime directory. ## Alternative OS installations -With the above instructions LibreTime is installed on Ubuntu Trusty Tahir. The Vagrant setup offers the option to choose a different operation system according to you needs. +With the above instructions LibreTime is installed on Ubuntu Xenial Xerus. The Vagrant setup offers the option to choose a different operation system according to you needs. | OS | Command | Comment | | ------ | ------------------- | ------- | -| Ubuntu 14.04 | `vagrant up ubuntu-trusty` | Current default install since it was used by legacy upstream, based on Ubuntu Trusty Tahir. | -| Debian 8.7 | `vagrant up debian-jessie` | Recommended install on Debian Jessie as per the docs. | -| Debian 9.2 | `vagrant up debian-stretch` | Experimental install on current Debian Stretch. | -| Ubuntu 16.04 | `vagrant up ubuntu-xenial` | Experimental install on current Ubuntu Xenial Xerus. | +| Debian 9.2 | `vagrant up debian-stretch` | Install on current Debian Stretch. | +| Debian 8.7 | `vagrant up debian-jessie` | Install on Debian Jessie. | | Debian 7.11 | `vagrant up debian-wheezy` | Deprecated install on Debian Wheezy. Please switch to debian-stretch. | +| Ubuntu 18.04 | `vagrant up ubuntu-bionic` | Experimental install on current Ubuntu Bionic Beaver. | +| Ubuntu 16.04 | `vagrant up ubuntu-xenial` | Install on Ubuntu Xenial Xerus. | +| Ubuntu 14.04 | `vagrant up ubuntu-trusty` | Deprecated install on Ubuntu Trusty Tahir. Recommended by legacy upstream. | | CentOS | `vagrant up centos` | Extremely experimental install on 7.3 with native systemd support and activated SELinux. Needs manual intervention due to Liquidsoap 1.3.3. | ## Troubleshooting diff --git a/install b/install index f46ac0d70..b2d0a2a0d 100755 --- a/install +++ b/install @@ -588,6 +588,7 @@ is_debian_stretch=false is_debian_jessie=false is_debian_wheezy=false is_ubuntu_dist=false +is_ubuntu_bionic=false is_ubuntu_xenial=false is_ubuntu_trusty=false is_centos_dist=false @@ -598,6 +599,11 @@ code="${code:-$VERSION_ID}" code="${code,,}" verbose "Validating dist-code: ${dist}-${code}" case "${dist}-${code}" in + ubuntu-18.04) + code="bionic" + is_ubuntu_dist=true + is_ubuntu_bionic=true + ;; ubuntu-16.04|ubuntu-xenial|ubuntu-xenial_docker_minimal) code="xenial" is_ubuntu_dist=true @@ -970,6 +976,7 @@ loud " * Configuring PHP in Apache * " loud "-----------------------------------------------------" # Test common locations for php conf directory php_conf_dirs=( + "/etc/php/7.2/apache2/conf.d" # Ubuntu Bionic "/etc/php/7.0/apache2/conf.d" # Ubuntu Xenial "/etc/php5/apache2/conf.d" # Debian Stretch, Debian Jessie, Ubuntu Trusty "/etc/php.d" # CentOS 7 @@ -992,7 +999,9 @@ else fi # Enable Apache modules -if $is_ubuntu_xenial || $is_debian_stretch; then +if $is_ubuntu_bionic; then + loudCmd "a2enmod rewrite php7.2" +elif $is_ubuntu_xenial || $is_debian_stretch; then loudCmd "a2enmod rewrite php7.0" elif $is_centos_dist; then verbose "TODO: enable Apache modules mod_rewrite and mod_php manually" diff --git a/installer/lib/requirements-debian-wheezy.apt b/installer/lib/requirements-debian-wheezy.apt deleted file mode 100644 index 2a96f0010..000000000 --- a/installer/lib/requirements-debian-wheezy.apt +++ /dev/null @@ -1,66 +0,0 @@ -apache2 -libapache2-mod-php5 -php5 -php-pear -php5-gd - -lsb-release - -zip -unzip - -rabbitmq-server - -postgresql -postgresql-client -php5-pgsql - -python -python-virtualenv -python-pip - -libsoundtouch-ocaml -libtaglib-ocaml -libao-ocaml -libmad-ocaml -ecasound -libportaudio2 -libsamplerate0 -libvo-aacenc0 - -python-rgain -python-gst0.10 -gstreamer0.10-plugins-ugly -gir1.2-gstreamer-0.10 - -patch - -icecast2 - -curl -php5-curl -mpg123 - -libcamomile-ocaml-data -libpulse0 -vorbis-tools -lsb-release -lsof -mp3gain -vorbisgain -flac -vorbis-tools -pwgen -libfaad2 -php-apc - -lame - -coreutils - -liquidsoap - -libopus0 - -sysvinit -sysvinit-utils diff --git a/installer/lib/requirements-ubuntu-bionic.apt b/installer/lib/requirements-ubuntu-bionic.apt new file mode 100644 index 000000000..08e6f21a6 --- /dev/null +++ b/installer/lib/requirements-ubuntu-bionic.apt @@ -0,0 +1,83 @@ +apache2 +libapache2-mod-php7.2 +php7.2 +php-pear +php7.2-gd +php-bcmath +php-mbstring + +lsb-release + +zip +unzip + +rabbitmq-server + +postgresql +postgresql-client +php7.2-pgsql + +python +python-virtualenv +python-pip + +libsoundtouch-ocaml +libtaglib-ocaml +libao-ocaml +libmad-ocaml +ecasound +libportaudio2 +libsamplerate0 + +python-rgain +python-gst-1.0 +gstreamer1.0-plugins-ugly +python-pika + +patch + +php7.2-curl +mpg123 +curl + +icecast2 + +libcamomile-ocaml-data +libpulse0 +vorbis-tools +lsof +vorbisgain +flac +vorbis-tools +pwgen +libfaad2 +php-apcu + +lame + +coreutils + +liquidsoap +liquidsoap-plugin-alsa +liquidsoap-plugin-ao +liquidsoap-plugin-faad +liquidsoap-plugin-flac +liquidsoap-plugin-icecast +liquidsoap-plugin-lame +liquidsoap-plugin-mad +liquidsoap-plugin-ogg +liquidsoap-plugin-portaudio +liquidsoap-plugin-pulseaudio +liquidsoap-plugin-taglib +liquidsoap-plugin-voaacenc +liquidsoap-plugin-vorbis + +silan +libopus0 + +sysvinit-utils + +build-essential +libssl-dev +libffi-dev +python-dev diff --git a/installer/lib/requirements-ubuntu-precise.apt b/installer/lib/requirements-ubuntu-precise.apt index 2855878e9..7c217f659 100644 --- a/installer/lib/requirements-ubuntu-precise.apt +++ b/installer/lib/requirements-ubuntu-precise.apt @@ -44,7 +44,6 @@ libpulse0 vorbis-tools lsb-release lsof -mp3gain vorbisgain flac vorbis-tools diff --git a/installer/lib/requirements-ubuntu-trusty.apt b/installer/lib/requirements-ubuntu-trusty.apt index df0fb50d2..9a93d918b 100644 --- a/installer/lib/requirements-ubuntu-trusty.apt +++ b/installer/lib/requirements-ubuntu-trusty.apt @@ -45,7 +45,6 @@ libpulse0 vorbis-tools lsb-release lsof -mp3gain vorbisgain flac vorbis-tools diff --git a/installer/lib/requirements-ubuntu-xenial.apt b/installer/lib/requirements-ubuntu-xenial.apt index 9d513657c..70336c10c 100644 --- a/installer/lib/requirements-ubuntu-xenial.apt +++ b/installer/lib/requirements-ubuntu-xenial.apt @@ -46,8 +46,6 @@ libcamomile-ocaml-data libpulse0 vorbis-tools lsof -# mp3gain need to be installed over an external ppa or the use of easymp3gain -easymp3gain-gtk vorbisgain flac vorbis-tools diff --git a/installer/lib/requirements-ubuntu-xenial_docker_minimal.apt b/installer/lib/requirements-ubuntu-xenial_docker_minimal.apt index 0238132ba..6d414ba2d 100644 --- a/installer/lib/requirements-ubuntu-xenial_docker_minimal.apt +++ b/installer/lib/requirements-ubuntu-xenial_docker_minimal.apt @@ -41,8 +41,6 @@ libcamomile-ocaml-data libpulse0 vorbis-tools lsof -# mp3gain need to be installed over an external ppa or the use of easymp3gain -easymp3gain-gtk vorbisgain flac vorbis-tools