From f75c533d0b2ad8d113826af1ca2605d3dc8f0ee8 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Sun, 14 Jul 2019 11:09:55 +0200 Subject: [PATCH] :boom: (ubuntu) drop trusty from installer --- .travis.yml | 1 - Vagrantfile | 6 -- docs/testing.md | 4 +- docs/vagrant.md | 1 - install | 13 +--- installer/lib/requirements-ubuntu-trusty.apt | 82 -------------------- 6 files changed, 5 insertions(+), 102 deletions(-) delete mode 100644 installer/lib/requirements-ubuntu-trusty.apt diff --git a/.travis.yml b/.travis.yml index fdbe29289..ba6984565 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,6 @@ addons: - python-rgain - python-gst-1.0 - python-magic - - mp3gain - dos2unix install: - > diff --git a/Vagrantfile b/Vagrantfile index 863c8bef6..448283f03 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -45,12 +45,6 @@ Vagrant.configure("2") do |config| os.vm.box = "bento/ubuntu-16.04" provision_libretime(os, "debian.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, "debian.sh", installer_args) - end config.vm.define "debian-stretch" do |os| os.vm.box = "bento/debian-9.6" provision_libretime(os, "debian.sh", installer_args) diff --git a/docs/testing.md b/docs/testing.md index d4b1e1ae1..1708b5eb3 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -24,8 +24,8 @@ In this case the libretime database is only used for the initial connection over which the libretime_test database is created. You may need to tweak the exact commands needed to setup postgresql depending -on the distro you installed this to. On Ubuntu trusty the above can be -acheived as follows. +on the distro you installed this to. On Ubuntu the above can be acheived as +follows. ```bash sudo -u postgres psql -c 'CREATE DATABASE libretime;' diff --git a/docs/vagrant.md b/docs/vagrant.md index 7dd5738f8..42139f85d 100644 --- a/docs/vagrant.md +++ b/docs/vagrant.md @@ -99,7 +99,6 @@ offers the option to choose a different operation system according to you needs. | Debian 9.6 | `vagrant up debian-stretch` | Install on current 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 5780d0c9a..1dcd695b5 100755 --- a/install +++ b/install @@ -589,11 +589,9 @@ fi is_debian_dist=false is_debian_buster=false is_debian_stretch=false -is_debian_jessie=false is_ubuntu_dist=false is_ubuntu_bionic=false is_ubuntu_xenial=false -is_ubuntu_trusty=false is_centos_dist=false is_centos_7=false # Use specified distribution and release or detected otherwise. @@ -613,12 +611,9 @@ case "${dist}-${code}" in is_ubuntu_xenial=true ;; ubuntu-14.04|ubuntu-trusty) - code="trusty" - is_ubuntu_dist=true - is_ubuntu_trusty=true - echo -e "WARNING: Ubuntu Trusty will be EOL by April 2019 and LibreTime will no longer support it at that point." >&2 - echo -e "Please upgrade to a non-EOL distro ASAP!" >&2 - sleep 6 + echo -e "ERROR: Ubuntu Trusty is archived and does not receive any security or other updates since 2019-04-17." >&2 + echo -e "The LibreTime installer dropped support for installing LibreTime on Trusty in 3.0.0-alpha.8." >&2 + exit 1 ;; debian-9|debian-stretch) code="stretch" @@ -639,8 +634,6 @@ case "${dist}-${code}" in ;; #End of fix debian-8|debian-jessie) - code="jessie" - is_debian_dist=true echo -e "ERROR: Debian Jessie is archived and does not receive any security or other updates since 2018-05-17." >&2 echo -e "The LibreTime installer dropped support for installing LibreTime on Jessie in 3.0.0-alpha.8." >&2 exit 1 diff --git a/installer/lib/requirements-ubuntu-trusty.apt b/installer/lib/requirements-ubuntu-trusty.apt deleted file mode 100644 index 9a93d918b..000000000 --- a/installer/lib/requirements-ubuntu-trusty.apt +++ /dev/null @@ -1,82 +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 - -python-rgain -python-gst-1.0 -gstreamer1.0-plugins-ugly -python-pika - -patch - -curl -php5-curl -mpg123 - -icecast2 - -libcamomile-ocaml-data -libpulse0 -vorbis-tools -lsb-release -lsof -vorbisgain -flac -vorbis-tools -pwgen -libfaad2 -php-apc - -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