diff --git a/Vagrantfile b/Vagrantfile index 0408a90..2e364f8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -11,8 +11,8 @@ Vagrant.configure("2") do |config| ] vms_freebsd = [ - { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.1-STABLE", :vars => {} }, - { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.0-CURRENT", :vars => {} } + { :name => "freebsd-11", :box => "freebsd/FreeBSD-11.3-STABLE", :vars => {} }, + { :name => "freebsd-12", :box => "freebsd/FreeBSD-12.1-STABLE", :vars => {} } ] conts = [ @@ -64,7 +64,7 @@ Vagrant.configure("2") do |config| v.cpus = 2 v.memory = 512 end - m.vm.provision "shell", inline: "pkg install -y python bash" + m.vm.provision "shell", inline: "[ -e /usr/local/bin/bash ] || pkg install -y python bash" m.vm.provision "ansible" do |ansible| ansible.playbook = "tests/test.yml" ansible.verbose = 'vv' diff --git a/tests/includes/pre_FreeBSD.yml b/tests/includes/pre_FreeBSD.yml index 44e5e2a..7a339fa 100644 --- a/tests/includes/pre_FreeBSD.yml +++ b/tests/includes/pre_FreeBSD.yml @@ -5,12 +5,20 @@ nginx_pkgng_package: 'nginx-full' nginx_user: 'www' nginx_php: - - version: '7.2' + - upstream_name: 'manual' sockets: - host: '127.0.0.1' port: 9000 - nginx_load_modules: - - /usr/local/libexec/nginx/ngx_http_geoip_module.so + - upstream_name: 'hx_unix' + sockets: + - host: '127.0.0.1' + port: 9000 + - upstream_name: 'hx_ip' + sockets: + - host: '127.0.0.1' + port: 9000 +# nginx_load_modules: +# - /usr/local/libexec/nginx/ngx_http_geoip_module.so ngrok_path: '/usr/local/bin/ngrok' - name: PKGNG | Install needed packages @@ -22,16 +30,16 @@ - curl - daemonize - fcgiwrap - - GeoIP +# - GeoIP - jq - nghttp2 - - php72 + - php74 - vim -- name: COMMAND | Get geoip database - command: geoipupdate.sh - args: - creates: /usr/local/share/GeoIP/GeoIP.dat +#- name: COMMAND | Get geoip database +# command: geoipupdate.sh +# args: +# creates: /usr/local/share/GeoIP/GeoIP.dat - name: SERVICE | Force start services service: