Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Reorganised chef deps

  • Loading branch information...
commit 2801d58b6de5ce5e817f44d53c63bc1b6d60c55d 1 parent 903ecfc
@ivanvanderbyl authored
Showing with 17 additions and 37 deletions.
  1. +3 −1 chef-server-rubygems.rb
  2. +0 −36 chef-server.rb
  3. +14 −0 software.rb
View
4 chef-server-rubygems.rb
@@ -10,6 +10,8 @@
]
}
+dep('bootstrap chef') { requires 'bootstrap chef server with rubygems' }
+
dep('rubygems with no docs') {
met? {
File.exists?("/etc/gemrc") &&
@@ -33,4 +35,4 @@
dep 'ohai.gem' do
installs 'ohai'
-end
+end
View
36 chef-server.rb
@@ -25,20 +25,6 @@
}
}
-dep 'wget.managed' do
- installs {
- via :apt, 'wget'
- }
- provides "wget"
-end
-
-dep('vim.managed') {
- installs {
- via :apt, 'vim'
- }
- provides 'vim'
-}
-
dep('chef.managed') {
installs {
via :apt, 'chef'
@@ -53,25 +39,3 @@
}
provides %w(chef-server chef-server-webui chef-solr)
}
-
-dep('rabbitmq-server.managed') {
- requires {
- on :ubuntu, 'updated rabbitmq source'
- }
-
- installs {
- via :apt, 'rabbitmq-server'
- }
-
- provides %w(rabbitmq-server rabbitmqctl)
- # met? { in_path? 'rabbitmq-server >= 2.4' }
-}
-
-dep('updated rabbitmq source') {
- met? { File.exists? "/etc/apt/sources.list.d/rabbitmq.list"}
- meet {
- shell 'echo "deb http://www.rabbitmq.com/debian/ testing main" | sudo tee /etc/apt/sources.list.d/rabbitmq.list'
- shell 'wget -qO - http://www.rabbitmq.com/rabbitmq-signing-key-public.asc | sudo apt-key add -'
- shell 'sudo apt-get update'
- }
-}
View
14 software.rb
@@ -3,6 +3,20 @@
on :linux, 'vim.managed', 'curl.managed', 'htop.managed', 'jnettop.managed', 'screen.managed', 'nmap.managed', 'tree.managed'
}
end
+
+dep 'wget.managed' do
+ installs {
+ via :apt, 'wget'
+ }
+ provides "wget"
+end
+
+dep('vim.managed') {
+ installs {
+ via :apt, 'vim'
+ }
+ provides 'vim'
+}
dep 'nmap.managed'
dep 'screen.managed'
dep 'jnettop.managed' do
Please sign in to comment.
Something went wrong with that request. Please try again.