Merge branch 'master' into feature/15-parity

This commit is contained in:
Greg Karékinian 2017-05-08 16:53:45 +02:00
commit 2e0730e3e8
10 changed files with 6 additions and 48 deletions

1
Vagrantfile vendored
View File

@ -18,6 +18,7 @@ Vagrant.configure(2) do |config|
config.vm.provider :virtualbox do |vb| config.vm.provider :virtualbox do |vb|
# Customize the amount of memory on the VM: # Customize the amount of memory on the VM:
vb.memory = "1024" vb.memory = "1024"
vb.cpus = 2
end end
config.vm.provider :docker do |d, override| config.vm.provider :docker do |d, override|

View File

@ -1,11 +1,4 @@
# 5apps-hubot CHANGELOG # 5apps-hubot CHANGELOG
This file is used to list changes made in each version of the 5apps-hubot cookbook.
## 0.1.0 ## 0.1.0
- [your_name] - Initial release of 5apps-hubot - [Greg Karékinian] - 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.

View File

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

View File

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

View File

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

View File

@ -1,11 +1,4 @@
# kosmos-mastodon CHANGELOG # kosmos-mastodon CHANGELOG
This file is used to list changes made in each version of the kosmos-mastodon cookbook.
## 0.1.0 ## 0.1.0
- [your_name] - Initial release of kosmos-mastodon - [Greg Karékinian] - 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.

View File

@ -1,13 +1,6 @@
kosmos-mediawiki CHANGELOG kosmos-mediawiki CHANGELOG
========================== ==========================
This file is used to list changes made in each version of the kosmos-mediawiki cookbook.
0.1.0 0.1.0
----- -----
- [your_name] - Initial release of kosmos-mediawiki - [Greg Karékinian] - 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.

View File

@ -1,13 +1,6 @@
kosmos-wordpress CHANGELOG kosmos-wordpress CHANGELOG
========================== ==========================
This file is used to list changes made in each version of the kosmos-wordpress cookbook.
0.1.0 0.1.0
----- -----
- [your_name] - Initial release of kosmos-wordpress - [Greg Karékinian] - 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.

View File

@ -1,13 +1,6 @@
sockethub CHANGELOG sockethub CHANGELOG
=================== ===================
This file is used to list changes made in each version of the sockethub cookbook.
0.1.0 0.1.0
----- -----
- [your_name] - Initial release of sockethub - [Greg Karékinian] - 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.

View File

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