[WIP] Working on FreeBSD tests

Replace ngrok by serveo.net?
py3
Emilien Mantel 2019-12-29 18:18:24 +01:00
parent a9a72dd25f
commit 4a2478a4fb
2 changed files with 20 additions and 12 deletions

6
Vagrantfile vendored
View File

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

View File

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