hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

make CentOS 8 the default vagrant script

Browse Source 
This puts it in line with the Ubunutu scripts.
This commit is contained in:
Sarah Hoffmann
2020-09-16 17:34:36 +02:00
parent 2029931b95
commit fb63a7418e
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Vagrantfile vendored
View File

@@ -12,25 +12,25 @@ Vagrant.configure("2") do |config|
# Never sync the current directory to /vagrant. # Never sync the current directory to /vagrant.
config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.synced_folder ".", "/vagrant", disabled: true
checkout = "yes" checkout = "yes"
if ENV['CHECKOUT'] != 'y' then
checkout = "no"
end
config.vm.provider "virtualbox" do |vb| config.vm.provider "virtualbox" do |vb, override|
vb.gui = false vb.gui = false
vb.memory = 2048 vb.memory = 2048
vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"] vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"]
if ENV['CHECKOUT'] != 'y' then if ENV['CHECKOUT'] != 'y' then
config.vm.synced_folder ".", "/home/vagrant/Nominatim" override.vm.synced_folder ".", "/home/vagrant/Nominatim"
checkout = "no"
end end
end end
config.vm.provider "libvirt" do |lv| config.vm.provider "libvirt" do |lv, override|
lv.memory = 2048 lv.memory = 2048
lv.nested = true lv.nested = true
if ENV['CHECKOUT'] != 'y' then if ENV['CHECKOUT'] != 'y' then
config.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs' override.vm.synced_folder ".", "/home/vagrant/Nominatim", type: 'nfs'
checkout = "no"
end end
end end
@@ -88,24 +88,22 @@ Vagrant.configure("2") do |config|
end end
end end
config.vm.define "centos" do |sub| config.vm.define "centos7" do |sub|
sub.vm.box = "centos/7" sub.vm.box = "centos/7"
sub.vm.provision :shell do |s| sub.vm.provision :shell do |s|
s.path = "vagrant/Install-on-Centos-7.sh" s.path = "vagrant/Install-on-Centos-7.sh"
s.privileged = false s.privileged = false
s.args = "yes" s.args = [checkout]
end end
sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true
end end
config.vm.define "centos8" do |sub| config.vm.define "centos" do |sub|
sub.vm.box = "generic/centos8" sub.vm.box = "generic/centos8"
sub.vm.provision :shell do |s| sub.vm.provision :shell do |s|
s.path = "vagrant/Install-on-Centos-8.sh" s.path = "vagrant/Install-on-Centos-8.sh"
s.privileged = false s.privileged = false
s.args = "yes" s.args = [checkout]
end end
sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true
end end