chef-server 0.8.16 → 0.9.0.a90

data/app/controllers/application.rb

@@ -1,2 +0,0 @@
-class Application < Merb::Controller
-end

data/app/helpers/global_helpers.rb

@@ -1,5 +0,0 @@
-module Merb
-  module GlobalHelpers
-    # helpers defined here available to all views.  
-  end
-end

data/app/views/exceptions/not_acceptable.html.erb

@@ -1,63 +0,0 @@
-<div id="container">
-  <div id="header-container">
-    <img src="/images/merb.jpg" />
-    <!-- <h1>Mongrel + Erb</h1> -->
-    <h2>pocket rocket web framework</h2>
-    <hr />
-  </div>
-
-  <div id="left-container">
-    <h3>Exception:</h3>
-    <p><%= request.exceptions.first.message %></p>
-  </div>
-
-  <div id="main-container">
-    <h3>Why am I seeing this page?</h3>
-    <p>Merb couldn't find an appropriate content_type to return,
-      based on what you said was available via provides() and
-      what the client requested.</p>
-
-    <h3>How to add a mime-type</h3>
-    <pre><code>
-      Merb.add_mime_type :pdf, :to_pdf, %w[application/pdf], &quot;Content-Encoding&quot; =&gt; &quot;gzip&quot;
-    </code></pre>
-    <h3>What this means is:</h3>
-    <ul>
-      <li>Add a mime-type for :pdf</li>
-      <li>Register the method for converting objects to PDF as <code>#to_pdf</code>.</li>
-      <li>Register the incoming mime-type "Accept" header as <code>application/pdf</code>.</li>
-      <li>Specify a new header for PDF types so it will set <code>Content-Encoding</code> to gzip.</li>
-    </ul>
-
-    <h3>You can then do:</h3>
-    <pre><code>
-      class Foo &lt; Application
-        provides :pdf
-      end
-    </code></pre>
-
-    <h3>Where can I find help?</h3>
-    <p>If you have any questions or if you can't figure something out, please take a
-      look at our <a href="http://merbivore.com/"> project page</a>,
-      feel free to come chat at irc.freenode.net, channel #merb,
-      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
-      on Google Groups.</p>
-      
-    <h3>What if I've found a bug?</h3>
-    <p>If you want to file a bug or make your own contribution to Merb,
-      feel free to register and create a ticket at our
-      <a href="http://merb.lighthouseapp.com/">project development page</a>
-      on Lighthouse.</p>
-
-    <h3>How do I edit this page?</h3>
-    <p>You can change what people see when this happens by editing <tt>app/views/exceptions/not_acceptable.html.erb</tt>.</p> 
-
-  </div>
-
-  <div id="footer-container">
-    <hr />
-    <div class="left"></div>
-    <div class="right">&copy; 2008 the merb dev team</div>
-    <p>&nbsp;</p>
-  </div>
-</div>

data/app/views/exceptions/not_found.html.erb

@@ -1,47 +0,0 @@
-<div id="container">
-  <div id="header-container">
-    <img src="/images/merb.jpg" />
-    <!-- <h1>Mongrel + Erb</h1> -->
-    <h2>pocket rocket web framework</h2>
-    <hr />
-  </div>
-
-  <div id="left-container">
-    <h3>Exception:</h3>
-    <p><%= request.exceptions.first.message %></p>
-  </div>
-
-  <div id="main-container">
-    <h3>Welcome to Merb!</h3>
-    <p>Merb is a light-weight MVC framework written in Ruby.  We hope you enjoy it.</p>
-    
-    <h3>Where can I find help?</h3>
-    <p>If you have any questions or if you can't figure something out, please take a
-      look at our <a href="http://merbivore.com/"> project page</a>,
-      feel free to come chat at irc.freenode.net, channel #merb,
-      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
-      on Google Groups.</p>
-      
-    <h3>What if I've found a bug?</h3>
-    <p>If you want to file a bug or make your own contribution to Merb,
-      feel free to register and create a ticket at our
-      <a href="http://merb.lighthouseapp.com/">project development page</a>
-      on Lighthouse.</p>
-
-    <h3>How do I edit this page?</h3>
-    <p>You're seeing this page because you need to edit the following files:
-      <ul>
-        <li>config/router.rb <strong><em>(recommended)</em></strong></li>
-        <li>app/views/exceptions/not_found.html.erb <strong><em>(recommended)</em></strong></li>
-        <li>app/views/layout/application.html.erb <strong><em>(change this layout)</em></strong></li>
-      </ul>
-    </p>
-  </div>
-
-  <div id="footer-container">
-    <hr />
-    <div class="left"></div>
-    <div class="right">&copy; 2008 the merb dev team</div>
-    <p>&nbsp;</p>
-  </div>
-</div>

data/app/views/layout/application.html.erb

@@ -1,12 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-  <head>
-    <title>Fresh Merb App</title>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8" />
-  </head>
-  <body>
-    <%#= message[:notice] %>
-    <%= catch_content :for_layout %>
-  </body>
-</html>

data/bin/chef-server

@@ -1,77 +0,0 @@
-#!/usr/bin/env ruby
-#
-# ./chef-server - Serving up piping hot infrastructure!
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Based on the 'merb' command, by Ezra
-
-# Add chef and chef-server-slice lib dirs to the load path
-# Load chef and chef-server slice from source rather than gem, if present
-
-require "rubygems"
-require "merb-core"
-
-CHEF_SERVER_VERSION = "0.8.16"
-
-[ 'chef', 'chef-server-api' ].each do |lib|
-  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib")))
-  library = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb"))
-  require library if File.exists?(library)
-end
-
-# Ensure the chef gem we load is the same version as the chef server
-unless defined?(Chef)
-  gem "chef", "=" + CHEF_SERVER_VERSION 
-  require 'chef'  
-end
-
-Dir.chdir File.join(File.dirname(__FILE__),"..")
-__DIR__ = Dir.getwd
-
-if ARGV[0] && ARGV[0] =~ /^[^-]/
-  ARGV.push "-H"
-end 
-unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
-  ARGV.push *%w[-a thin]
-end
-ARGV.push *[ "-I", File.join(__DIR__, "config", "init.rb") ]
-ARGV.push *[ "-m", __DIR__]
-
-# attempt to find the user and group that this process will become. Fixes CHEF-1015
-if (index = ARGV.index("-u"))
-  Chef::Config[:signing_ca_user] = ARGV[index+1]
-end
-if (index = ARGV.index("-G"))
-  Chef::Config[:signing_ca_group] = ARGV[index+1]
-end
-
-if index = ARGV.index("-C")
-  config = ARGV[index+1]
-  ARGV.delete("-C")
-  ARGV.delete(config)
-  Chef::Config.from_file(File.expand_path(config))
-else
-  Chef::Config.from_file(
-    File.join("/etc", "chef", "server.rb")
-  )
-end
-
-Chef::Log.init(Chef::Config[:log_location]) 
-Chef::Log.level = Chef::Config[:log_level]
-
-Merb.start

data/bin/chef-server-webui

@@ -1,72 +0,0 @@
-#!/usr/bin/env ruby
-#
-# ./chef-server - Serving up piping hot infrastructure!
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Based on the 'merb' command, by Ezra
-
-# Add chef and chef-server-slice lib dirs to the load path
-# Load chef and chef-server slice from source rather than gem, if present
-
-require "rubygems"
-require "merb-core"
-
-[ 'chef', 'chef-server-webui' ].each do |lib|
-  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib")))
-  library = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb"))
-  require library if File.exists?(library)
-end
-
-CHEF_SERVER_VERSION = "0.8.16"
-
-# Ensure the chef gem we load is the same version as the chef server
-unless defined?(Chef)
-  gem "chef", "=" + CHEF_SERVER_VERSION 
-  require 'chef'  
-end
-
-Dir.chdir File.join(File.dirname(__FILE__),"..")
-__DIR__ = Dir.getwd
-
-if ARGV[0] && ARGV[0] =~ /^[^-]/
-  ARGV.push "-H"
-end 
-unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
-  ARGV.push *%w[-a thin]
-end
-unless %w[-p --port].any? { |o| ARGV.index(o) }
-  ARGV.push *%w[-p 4040]
-end
-ARGV.push *[ "-I", File.join(__DIR__, "config", "init-webui.rb") ]
-ARGV.push *[ "-m", __DIR__]
-
-if index = ARGV.index("-C")
-  config = ARGV[index+1]
-  ARGV.delete("-C")
-  ARGV.delete(config)
-  Chef::Config.from_file(File.expand_path(config))
-else
-  Chef::Config.from_file(
-    File.join("/etc", "chef", "server.rb")
-  )
-end
-
-Chef::Log.init(Chef::Config[:log_location]) 
-Chef::Log.level = Chef::Config[:log_level]
-
-Merb.start

data/config-webui.ru

@@ -1,25 +0,0 @@
-require 'rubygems'
-require 'merb-core'
-require 'chef'
-
-Chef::Config.from_file(File.join("/etc", "chef", "server.rb"))
-
-Merb::Config.setup(:merb_root   => File.expand_path(File.dirname(__FILE__)), 
-                   :environment => 'production',
-                   :fork_for_class_load => false,
-                   :init_file => File.dirname(__FILE__) / "config/init-webui.rb")
-Merb.environment = Merb::Config[:environment]
-Merb.root = Merb::Config[:merb_root]
-Merb::BootLoader.run
-
-Merb::Slices.config.each do |slice_module, config|
-  slice_module = Object.full_const_get(slice_module.to_s.camel_case) if slice_module.class.in?(String, Symbol)
-  slice_module.send("public_components").each do |component|
-    slice_static_dir = slice_module.send("dir_for", :public)
-    use Merb::Rack::Static, slice_static_dir
-  end
-end
-
-run Merb::Rack::Application.new
-
-

data/config.ru

@@ -1,21 +0,0 @@
-require 'rubygems'
-require 'merb-core'
-require 'chef'
-
-Chef::Config.from_file(File.join("/etc", "chef", "server.rb"))
-
-Merb::Config.setup(:merb_root   => File.expand_path(File.dirname(__FILE__)), 
-                   :environment => 'production',
-                   :fork_for_class_load => false,
-                   :init_file => File.dirname(__FILE__) / "config/init.rb")
-Merb.environment = Merb::Config[:environment]
-Merb.root = Merb::Config[:merb_root]
-Merb::BootLoader.run
- 
-# Uncomment if your app is mounted at a suburi
-#if prefix = ::Merb::Config[:path_prefix]
-#  use Merb::Rack::PathPrefix, prefix
-#end
-
-run Merb::Rack::Application.new
-

data/config/dependencies-webui.rb

@@ -1,27 +0,0 @@
-# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
-merb_gems_version = "> 1.0"
-
-%w{chef chef-server-webui}.each do |dep|
-  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", dep, "lib")))
-end
-
-dependency "chef", :immediate=>true unless defined?(Chef)
-
-begin
-  require 'chef'
-  require 'chef-server-webui'
-rescue LoadError
-end
-  
-# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
-dependency "merb-core", merb_gems_version 
-dependency "merb-slices", merb_gems_version  
-dependency "merb-haml", merb_gems_version
-dependency "merb-assets", merb_gems_version
-dependency "merb-helpers", merb_gems_version
-if defined?(CHEF_SERVER_VERSION)
-  dependency "chef-server-webui", CHEF_SERVER_VERSION unless defined?(ChefServerWebui)
-else
-  dependency "chef-server-webui" unless defined?(ChefServerWebui)
-end
-

data/config/dependencies.rb

@@ -1,24 +0,0 @@
-# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
-merb_gems_version = "> 1.0"
-
-%w{chef chef-server-api chef-solr}.each do |dep|
-  $:.unshift(File.join(File.dirname(__FILE__), "..", "..", dep, "lib"))
-end
-
-begin
-  require 'chef'
-  require 'chef-server-api'
-rescue
-end
-  
-# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
-dependency "merb-core", merb_gems_version 
-dependency "merb-assets", merb_gems_version  
-dependency "merb-helpers", merb_gems_version 
-dependency "merb-slices", merb_gems_version  
-if defined?(CHEF_SERVER_VERSION)
-  dependency "chef-server-api", CHEF_SERVER_VERSION unless defined?(ChefServerApi)
-else
-  dependency "chef-server-api" unless defined?(ChefServerApi)
-end
-

data/config/environments/development.rb

@@ -1,13 +0,0 @@
-Merb.logger.info("Loaded DEVELOPMENT Environment...")
-Merb::Config.use { |c|
-  c[:exception_details] = true
-  c[:reload_templates] = true
-  c[:reload_classes] = true
-  c[:reload_time] = 0.5
-  c[:log_auto_flush ] = true
-  c[:log_level] = :debug
-  c[:log_stream] = Chef::Config[:log_location]
-  c[:log_file]   = nil
-  # Or redirect logging into a file:
-  # c[:log_file]  = Merb.root / "log" / "development.log"
-}

data/config/environments/production.rb

@@ -1,10 +0,0 @@
-Merb.logger.info("Loaded PRODUCTION Environment...")
-Merb::Config.use { |c|
-  c[:exception_details] = false
-  c[:reload_classes] = false
-  c[:log_auto_flush] = true
-  c[:log_level] = Chef::Config[:log_level]
-  c[:log_stream] = Chef::Config[:log_location]
-  # or redirect logger using IO handle
-  # c[:log_stream] = STDOUT
-}

data/config/environments/rake.rb

@@ -1,10 +0,0 @@
-Merb.logger.info("Loaded RAKE Environment...")
-Merb::Config.use { |c|
-  c[:exception_details] = true
-  c[:reload_classes]  = false
-  c[:log_auto_flush ] = true
-  c[:log_stream] = Chef::Config[:log_location]
-  c[:log_file]   = nil
-  # Or redirect logging into a file:
-  # c[:log_file]  = Merb.root / "log" / "development.log"
-}

data/config/environments/staging.rb

@@ -1,10 +0,0 @@
-Merb.logger.info("Loaded STAGING Environment...")
-Merb::Config.use { |c|
-  c[:exception_details] = false
-  c[:reload_classes]    = false
-  c[:log_level]         = :error
-  c[:log_stream] = Chef::Config[:log_location]
-  c[:log_file]   = nil
-  # or redirect logger using IO handle
-  # c[:log_stream] = STDOUT
-}

data/config/environments/test.rb

@@ -1,13 +0,0 @@
-Merb.logger.info("Loaded TEST Environment...")
-Merb::Config.use { |c|
-  c[:testing]           = true
-  c[:exception_details] = true
-  c[:log_auto_flush ]   = true
-  
-  # log less in testing environment
-  c[:log_level]         = :error
-  c[:log_stream] = Chef::Config[:log_location]
-  c[:log_file]   = nil
-  #c[:log_file]  = Merb.root / "log" / "test.log"
-  # or redirect logger using IO handle
-}