X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/90b29aa8080ffae08084cf556b45e05f9f2d3198..c314a3092c5b51c7782015f6fa9ac093b46fa174:/Vagrantfile diff --git a/Vagrantfile b/Vagrantfile index 0cc511c5..753b1833 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -38,7 +38,7 @@ Vagrant.configure("2") do |config| lv.memory = 2048 lv.nested = true if ENV['CHECKOUT'] != 'y' then - override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs' + override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs', nfs_udp: false end end @@ -69,58 +69,30 @@ Vagrant.configure("2") do |config| end end - config.vm.define "ubuntu20" do |sub| - sub.vm.box = "generic/ubuntu2004" + config.vm.define "ubuntu24" do |sub| + sub.vm.box = "bento/ubuntu-24.04" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-20.sh" + s.path = "vagrant/Install-on-Ubuntu-24.sh" s.privileged = false s.args = [checkout] end end - config.vm.define "ubuntu20-apache" do |sub| - sub.vm.box = "generic/ubuntu2004" + config.vm.define "ubuntu24-apache" do |sub| + sub.vm.box = "bento/ubuntu-24.04" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-20.sh" + s.path = "vagrant/Install-on-Ubuntu-24.sh" s.privileged = false s.args = [checkout, "install-apache"] end end - config.vm.define "ubuntu20-nginx" do |sub| - sub.vm.box = "generic/ubuntu2004" + config.vm.define "ubuntu24-nginx" do |sub| + sub.vm.box = "bento/ubuntu-24.04" sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-20.sh" + s.path = "vagrant/Install-on-Ubuntu-24.sh" s.privileged = false s.args = [checkout, "install-nginx"] end end - - config.vm.define "ubuntu18" do |sub| - sub.vm.box = "generic/ubuntu1804" - sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-18.sh" - s.privileged = false - s.args = [checkout] - end - end - - config.vm.define "ubuntu18-apache" do |sub| - sub.vm.box = "generic/ubuntu1804" - sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-18.sh" - s.privileged = false - s.args = [checkout, "install-apache"] - end - end - - config.vm.define "ubuntu18-nginx" do |sub| - sub.vm.box = "generic/ubuntu1804" - sub.vm.provision :shell do |s| - s.path = "vagrant/Install-on-Ubuntu-18.sh" - s.privileged = false - s.args = [checkout, "install-nginx"] - end - end - end