diff --git a/Vagrantfile b/Vagrantfile index dbd154258..7299438a2 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -39,17 +39,17 @@ Vagrant.configure("2") do |config| # 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) + provision_libretime(os, "debian.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) + 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, "ubuntu.sh", installer_args) + provision_libretime(os, "debian.sh", installer_args) end config.vm.define "debian-jessie" do |os| os.vm.box = "bento/debian-8.7" diff --git a/installer/vagrant/ubuntu.sh b/installer/vagrant/ubuntu.sh deleted file mode 100644 index 81c755ed9..000000000 --- a/installer/vagrant/ubuntu.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# Install modern alsa module for snd-hda-intel -# slightly modernized from https://github.com/naomiaro/vagrant-alsa-audio -# https://wiki.ubuntu.com/Audio/UpgradingAlsa/DKMS -alsa_deb="oem-audio-hda-daily-dkms_0.201704090301~ubuntu14.04.1_all.deb" -wget -nv https://code.launchpad.net/~ubuntu-audio-dev/+archive/ubuntu/alsa-daily/+files/${alsa_deb} -dpkg -i ${alsa_deb} -rm ${alsa_deb} -DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install alsa - -usermod -a -G audio vagrant -# liquidsoap runs as apache -usermod -a -G audio www-data -