From eaaaacf97f08119098adfd42d9da40774f87fdf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 8 May 2017 12:07:32 +0200 Subject: [PATCH 1/3] Remove placeholder text from generated Chef cookbooks --- site-cookbooks/5apps-hubot/CHANGELOG.md | 9 +-------- site-cookbooks/5apps-xmpp_server/CHANGELOG.md | 2 -- site-cookbooks/ipfs/CHANGELOG.md | 2 -- site-cookbooks/kosmos-ipfs/CHANGELOG.md | 2 -- site-cookbooks/kosmos-mastodon/CHANGELOG.md | 9 +-------- site-cookbooks/kosmos-mediawiki/CHANGELOG.md | 9 +-------- site-cookbooks/kosmos-wordpress/CHANGELOG.md | 9 +-------- site-cookbooks/sockethub/CHANGELOG.md | 9 +-------- 8 files changed, 5 insertions(+), 46 deletions(-) diff --git a/site-cookbooks/5apps-hubot/CHANGELOG.md b/site-cookbooks/5apps-hubot/CHANGELOG.md index 2e739d7..0cc231e 100644 --- a/site-cookbooks/5apps-hubot/CHANGELOG.md +++ b/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 diff --git a/site-cookbooks/5apps-xmpp_server/CHANGELOG.md b/site-cookbooks/5apps-xmpp_server/CHANGELOG.md index 1790327..2668d1b 100644 --- a/site-cookbooks/5apps-xmpp_server/CHANGELOG.md +++ b/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 diff --git a/site-cookbooks/ipfs/CHANGELOG.md b/site-cookbooks/ipfs/CHANGELOG.md index 4b7a448..1523cdc 100644 --- a/site-cookbooks/ipfs/CHANGELOG.md +++ b/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 diff --git a/site-cookbooks/kosmos-ipfs/CHANGELOG.md b/site-cookbooks/kosmos-ipfs/CHANGELOG.md index 6115db6..4ef121b 100644 --- a/site-cookbooks/kosmos-ipfs/CHANGELOG.md +++ b/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 diff --git a/site-cookbooks/kosmos-mastodon/CHANGELOG.md b/site-cookbooks/kosmos-mastodon/CHANGELOG.md index 4e30fed..2c6362a 100644 --- a/site-cookbooks/kosmos-mastodon/CHANGELOG.md +++ b/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 diff --git a/site-cookbooks/kosmos-mediawiki/CHANGELOG.md b/site-cookbooks/kosmos-mediawiki/CHANGELOG.md index 7c7650b..0e86b43 100644 --- a/site-cookbooks/kosmos-mediawiki/CHANGELOG.md +++ b/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 diff --git a/site-cookbooks/kosmos-wordpress/CHANGELOG.md b/site-cookbooks/kosmos-wordpress/CHANGELOG.md index 0bf2beb..a253528 100644 --- a/site-cookbooks/kosmos-wordpress/CHANGELOG.md +++ b/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 diff --git a/site-cookbooks/sockethub/CHANGELOG.md b/site-cookbooks/sockethub/CHANGELOG.md index c02f029..fdd6020 100644 --- a/site-cookbooks/sockethub/CHANGELOG.md +++ b/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 From 4fdf64dfbd4e4eb3a41c44e5803e359ae408a6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 8 May 2017 16:47:58 +0200 Subject: [PATCH 2/3] Remove duplicate kosmos-nginx recipe directive --- site-cookbooks/sockethub/recipes/proxy.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/site-cookbooks/sockethub/recipes/proxy.rb b/site-cookbooks/sockethub/recipes/proxy.rb index c1fb46c..3961386 100644 --- a/site-cookbooks/sockethub/recipes/proxy.rb +++ b/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' From 5285f86043edcc56a903737532fcca95d45453aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 8 May 2017 16:53:03 +0200 Subject: [PATCH 3/3] Use two CPUs for the VirtualBox Vagrant box --- Vagrantfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Vagrantfile b/Vagrantfile index d73b11d..a5221b6 100644 --- a/Vagrantfile +++ b/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|