2017-03-05 19:40:56 +00:00
|
|
|
---
|
|
|
|
|
vagrants:
|
|
|
|
|
"ubuntu/trusty64": "ubuntu/trusty64"
|
2017-06-20 01:41:13 +00:00
|
|
|
<<<<<<< HEAD
|
2017-03-05 19:40:56 +00:00
|
|
|
"ubuntu/xenial64": "ubuntu/xenial64"
|
2017-06-20 01:39:38 +00:00
|
|
|
"boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
|
2017-03-05 19:40:56 +00:00
|
|
|
|
2017-06-20 01:41:13 +00:00
|
|
|
=======
|
2017-03-07 13:18:30 +00:00
|
|
|
"boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
|
|
|
|
|
|
2017-06-20 01:41:13 +00:00
|
|
|
>>>>>>> dfcfe37cf523476c0bd27c2a0d6e75ab9189654d
|
2017-03-05 19:40:56 +00:00
|
|
|
hosts:
|
2017-03-07 13:18:30 +00:00
|
|
|
docker: 10.200.200.20
|
2017-03-05 19:40:56 +00:00
|
|
|
nextcloud: 10.200.200.2
|
2017-06-20 01:39:38 +00:00
|
|
|
grafana: 10.200.200.3
|
|
|
|
|
proxy-home: 10.200.200.4
|
|
|
|
|
dns: 10.200.200.5
|
