Merge branch 'master' into feature/ubuntu-16.04

This commit is contained in:
Greg Karékinian
2017-06-09 16:36:19 +02:00
873 changed files with 38209 additions and 15880 deletions

39
Vagrantfile vendored
View File

@@ -13,7 +13,19 @@ Vagrant.configure(2) do |config|
# Every Vagrant development environment requires a box. You can search for
# boxes at https://atlas.hashicorp.com/search.
config.vm.box = "bento/ubuntu-16.04"
# config.vm.box = "bento/debian-8.7"
config.vm.provider :virtualbox do |vb|
# Customize the amount of memory on the VM:
vb.memory = "1024"
vb.cpus = 2
end
config.vm.provider :docker do |d, override|
d.image = "nishidayuya/docker-vagrant-ubuntu:xenial"
d.has_ssh = true
override.vm.box = nil
override.ssh.port = 22
end
# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs
@@ -70,16 +82,27 @@ Vagrant.configure(2) do |config|
# sudo apt-get install -y apache2
# SHELL
config.vm.provision :chef_solo do |chef|
chef.cookbooks_path = ['./cookbooks', './site-cookbooks']
chef.data_bags_path = './data_bags'
chef.roles_path = './roles'
# Install latest Chef via Omnibus
# Needs `vagrant plugin install vagrant-omnibus`
if Vagrant.has_plugin?("vagrant-omnibus")
config.omnibus.chef_version = "12.19.36"
end
config.vm.provision :chef_zero do |chef|
chef.cookbooks_path = ['cookbooks', 'site-cookbooks']
chef.data_bags_path = 'data_bags'
chef.roles_path = 'roles'
chef.node_name = "vagrant-node"
chef.environments_path = './environments'
chef.nodes_path = 'nodes'
chef.environments_path = 'environments'
chef.encrypted_data_bag_secret_key_path = '.chef/encrypted_data_bag_secret'
chef.environment = 'development'
chef.add_recipe 'kosmos-base'
chef.add_recipe 'kosmos-wordpress'
chef.add_recipe 'sockethub'
# chef.add_recipe 'sockethub'
# chef.add_recipe 'kosmos-mastodon'
# chef.add_recipe 'kosmos-mastodon::nginx'
# chef.add_recipe '5apps-hubot::xmpp_botka'
# chef.add_recipe 'kosmos-hubot'
end
end