Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge ubuntu and debian provision scripts

This commit is contained in:
Kyle Robbertze 2019-01-18 11:43:18 +02:00
parent 04e155885e
commit 4556318967
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Vagrantfile vendored
View File

@ -39,17 +39,17 @@ Vagrant.configure("2") do |config|
# define all the OS boxes we support # define all the OS boxes we support
config.vm.define "ubuntu-bionic" do |os| config.vm.define "ubuntu-bionic" do |os|
os.vm.box = "bento/ubuntu-18.04" os.vm.box = "bento/ubuntu-18.04"
provision_libretime(os, "ubuntu.sh", installer_args) provision_libretime(os, "debian.sh", installer_args)
end end
config.vm.define "ubuntu-xenial" do |os| config.vm.define "ubuntu-xenial" do |os|
os.vm.box = "bento/ubuntu-16.04" os.vm.box = "bento/ubuntu-16.04"
provision_libretime(os, "ubuntu.sh", installer_args) provision_libretime(os, "debian.sh", installer_args)
end end
config.vm.define "ubuntu-trusty" do |os| config.vm.define "ubuntu-trusty" do |os|
STDERR.puts 'WARNING: The "ubuntu-trusty" option is deprecated. Please migrate to "ubuntu-bionic".' STDERR.puts 'WARNING: The "ubuntu-trusty" option is deprecated. Please migrate to "ubuntu-bionic".'
STDERR.puts STDERR.puts
os.vm.box = "bento/ubuntu-14.04" os.vm.box = "bento/ubuntu-14.04"
provision_libretime(os, "ubuntu.sh", installer_args) provision_libretime(os, "debian.sh", installer_args)
end end
config.vm.define "debian-jessie" do |os| config.vm.define "debian-jessie" do |os|
os.vm.box = "bento/debian-8.7" os.vm.box = "bento/debian-8.7"

15
installer/vagrant/ubuntu.sh
View File

@ -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