parent
a9a72dd25f
commit
4a2478a4fb
|
@ -11,8 +11,8 @@ Vagrant.configure("2") do |config|
|
||||||
]
|
]
|
||||||
|
|
||||||
vms_freebsd = [
|
vms_freebsd = [
|
||||||
{ :name => "freebsd-11", :box => "freebsd/FreeBSD-11.1-STABLE", :vars => {} },
|
{ :name => "freebsd-11", :box => "freebsd/FreeBSD-11.3-STABLE", :vars => {} },
|
||||||
{ :name => "freebsd-12", :box => "freebsd/FreeBSD-12.0-CURRENT", :vars => {} }
|
{ :name => "freebsd-12", :box => "freebsd/FreeBSD-12.1-STABLE", :vars => {} }
|
||||||
]
|
]
|
||||||
|
|
||||||
conts = [
|
conts = [
|
||||||
|
@ -64,7 +64,7 @@ Vagrant.configure("2") do |config|
|
||||||
v.cpus = 2
|
v.cpus = 2
|
||||||
v.memory = 512
|
v.memory = 512
|
||||||
end
|
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|
|
m.vm.provision "ansible" do |ansible|
|
||||||
ansible.playbook = "tests/test.yml"
|
ansible.playbook = "tests/test.yml"
|
||||||
ansible.verbose = 'vv'
|
ansible.verbose = 'vv'
|
||||||
|
|
|
@ -5,12 +5,20 @@
|
||||||
nginx_pkgng_package: 'nginx-full'
|
nginx_pkgng_package: 'nginx-full'
|
||||||
nginx_user: 'www'
|
nginx_user: 'www'
|
||||||
nginx_php:
|
nginx_php:
|
||||||
- version: '7.2'
|
- upstream_name: 'manual'
|
||||||
sockets:
|
sockets:
|
||||||
- host: '127.0.0.1'
|
- host: '127.0.0.1'
|
||||||
port: 9000
|
port: 9000
|
||||||
nginx_load_modules:
|
- upstream_name: 'hx_unix'
|
||||||
- /usr/local/libexec/nginx/ngx_http_geoip_module.so
|
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'
|
ngrok_path: '/usr/local/bin/ngrok'
|
||||||
|
|
||||||
- name: PKGNG | Install needed packages
|
- name: PKGNG | Install needed packages
|
||||||
|
@ -22,16 +30,16 @@
|
||||||
- curl
|
- curl
|
||||||
- daemonize
|
- daemonize
|
||||||
- fcgiwrap
|
- fcgiwrap
|
||||||
- GeoIP
|
# - GeoIP
|
||||||
- jq
|
- jq
|
||||||
- nghttp2
|
- nghttp2
|
||||||
- php72
|
- php74
|
||||||
- vim
|
- vim
|
||||||
|
|
||||||
- name: COMMAND | Get geoip database
|
#- name: COMMAND | Get geoip database
|
||||||
command: geoipupdate.sh
|
# command: geoipupdate.sh
|
||||||
args:
|
# args:
|
||||||
creates: /usr/local/share/GeoIP/GeoIP.dat
|
# creates: /usr/local/share/GeoIP/GeoIP.dat
|
||||||
|
|
||||||
- name: SERVICE | Force start services
|
- name: SERVICE | Force start services
|
||||||
service:
|
service:
|
||||||
|
|
Loading…
Reference in New Issue