Permalink
Browse files

updated nginx to install from the repository, removed obsolete cookbooks

  • Loading branch information...
1 parent ec6647d commit ae389829433142055c59661fdf00dec1a856889c @mhutter mhutter committed May 13, 2012
Showing with 3 additions and 22 deletions.
  1. +0 −9 .gitmodules
  2. +2 −4 README.md
  3. +0 −1 cookbooks/build-essential
  4. +1 −6 cookbooks/main/recipes/default.rb
  5. +0 −1 cookbooks/postgresql
  6. +0 −1 cookbooks/runit
View
@@ -1,15 +1,6 @@
[submodule "cookbooks/nginx"]
path = cookbooks/nginx
url = https://github.com/opscode-cookbooks/nginx.git
-[submodule "cookbooks/build-essential"]
- path = cookbooks/build-essential
- url = https://github.com/opscode-cookbooks/build-essential.git
-[submodule "cookbooks/runit"]
- path = cookbooks/runit
- url = https://github.com/opscode-cookbooks/runit.git
[submodule "cookbooks/ohai"]
path = cookbooks/ohai
url = https://github.com/opscode-cookbooks/ohai.git
-[submodule "cookbooks/postgresql"]
- path = cookbooks/postgresql
- url = https://github.com/opscode-cookbooks/postgresql.git
View
@@ -23,7 +23,5 @@ Example:
Contents
---
* [git](http://git-scm.com)
-* [nginx](http://nginx.org) (s)
-* [postgresql](http://www.postgresql.org) - coming soon!
-
-(s) from source
+* [nginx](http://nginx.org)
+* [postgresql](http://www.postgresql.org)
Submodule build-essential deleted from 54dd15
@@ -22,10 +22,5 @@
include_recipe "main::config_files"
include_recipe "main::rbenv"
-include_recipe "nginx::source"
+include_recipe "nginx"
package "postgresql-9.1"
-
-# TODO: postgresql
-# does currently not work because of broken postgresql::server
-#include_recipe "postgresql::server"
-
Submodule postgresql deleted from 9eb99a
Submodule runit deleted from 068571

0 comments on commit ae38982

Please sign in to comment.