Merge branch 'master' into feature/15-parity

Vagrantfile

@@ -18,6 +18,7 @@ Vagrant.configure(2) do |config|
   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|

site-cookbooks/5apps-hubot/CHANGELOG.md

@@ -1,11 +1,4 @@
 # 5apps-hubot CHANGELOG
 
-This file is used to list changes made in each version of the 5apps-hubot cookbook.
-
 ## 0.1.0
-- [your_name] - Initial release of 5apps-hubot
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
+- [Greg Karékinian] - Initial release of 5apps-hubot

site-cookbooks/5apps-xmpp_server/CHANGELOG.md

@@ -1,6 +1,4 @@
 # 5apps-xmpp_server CHANGELOG
 
-This file is used to list changes made in each version of the 5apps-xmpp_server cookbook.
-
 ## 0.1.0
 - [Greg Karékinian] - Initial release of 5apps-xmpp_server

site-cookbooks/ipfs/CHANGELOG.md

@@ -1,6 +1,4 @@
 # ipfs CHANGELOG
 
-This file is used to list changes made in each version of the ipfs cookbook.
-
 ## 0.1.0
 - [gregkare] - Initial release of ipfs

site-cookbooks/kosmos-ipfs/CHANGELOG.md

@@ -1,6 +1,4 @@
 # kosmos-ipfs CHANGELOG
 
-This file is used to list changes made in each version of the kosmos-ipfs cookbook.
-
 ## 0.1.0
 - [gregkare] - Initial release of kosmos-ipfs

site-cookbooks/kosmos-mastodon/CHANGELOG.md

@@ -1,11 +1,4 @@
 # kosmos-mastodon CHANGELOG
 
-This file is used to list changes made in each version of the kosmos-mastodon cookbook.
-
 ## 0.1.0
-- [your_name] - Initial release of kosmos-mastodon
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
+- [Greg Karékinian] - Initial release of kosmos-mastodon

site-cookbooks/kosmos-mediawiki/CHANGELOG.md

@@ -1,13 +1,6 @@
 kosmos-mediawiki CHANGELOG
 ==========================
 
-This file is used to list changes made in each version of the kosmos-mediawiki cookbook.
-
 0.1.0
 -----
-- [your_name] - Initial release of kosmos-mediawiki
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
+- [Greg Karékinian] - Initial release of kosmos-mediawiki

site-cookbooks/kosmos-wordpress/CHANGELOG.md

@@ -1,13 +1,6 @@
 kosmos-wordpress CHANGELOG
 ==========================
 
-This file is used to list changes made in each version of the kosmos-wordpress cookbook.
-
 0.1.0
 -----
-- [your_name] - Initial release of kosmos-wordpress
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
+- [Greg Karékinian] - Initial release of kosmos-wordpress

site-cookbooks/sockethub/CHANGELOG.md

@@ -1,13 +1,6 @@
 sockethub CHANGELOG
 ===================
 
-This file is used to list changes made in each version of the sockethub cookbook.
-
 0.1.0
 -----
-- [your_name] - Initial release of sockethub
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
+- [Greg Karékinian] - Initial release of sockethub

site-cookbooks/sockethub/recipes/proxy.rb

@@ -27,8 +27,6 @@ directory "/var/www/sockethub" do
   recursive true
 end
 
-include_recipe 'kosmos-nginx'
-
 template "#{node['nginx']['dir']}/sites-available/sockethub" do
   source 'nginx_conf_sockethub.erb'
   owner 'www-data'