chef 0.7.16 → 0.8.2

data/distro/debian/etc/init.d/chef-indexer

@@ -1,175 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:           chef-indexer
-# Required-Start:     $network
-# Required-Stop:      $network
-# Default-Start:      2 3 4 5
-# Default-Stop:       0 1 6
-# Short-Description:  Start a chef-indexer.
-### END INIT INFO
-#
-# Copyright (c) 2009 Joshua Timberman, <joshua@opscode.com>
-#
-# chef-indexer         Startup script for chef-indexer.
-# chkconfig: - 98 02
-# description: starts up chef-indexer in daemon mode.
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-indexer
-NAME=chef-indexer
-DESC=chef-indexer
-LOGDIR=/var/log/chef
-CONFIG=/etc/chef/indexer.rb
-PIDFILE=/var/run/chef/indexer.pid
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -d /var/run/chef ]; then
-  mkdir /var/run/chef
-fi
-
-DAEMON_OPTS="-d -c $CONFIG"
-
-running_pid() {
-  pid=$1
-  name=$2
-  [ -z "$pid" ] && return 1
-  [ ! -d /proc/$pid ] &&  return 1
-  cmd=`cat /proc/$pid/cmdline | tr '\000' '\n' | awk 'NR==2'`
-  [ "$cmd" != "$name" ] &&  return 1
-  return 0
-}
-
-running() {
-  [ ! -f "$PIDFILE" ] && return 1
-  pid=`cat $PIDFILE`
-  running_pid $pid $DAEMON || return 1
-  return 0
-}
-
-start_server() {
-  if [ -z "$DAEMONUSER" ] ; then
-    start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
-  errcode=$?
-  else
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \
-      --chuid $DAEMONUSER \
-      --exec $DAEMON -- $DAEMON_OPTS
-    errcode=$?
-  fi
-  return $errcode
-}
-
-stop_server() {
-   if [ -z "$DAEMONUSER" ] ; then
-     killproc -p $PIDFILE $DAEMON
-     errcode=$?
-   else
-     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-       --user $DAEMONUSER \
-       --exec $DAEMON
-     errcode=$?
-   fi
-   return $errcode
-}
-
-reload_server() {
-  [ ! -f "$PIDFILE" ] && return 1
-  pid=pidofproc $PIDFILE # This is the daemon's pid
-  /bin/kill -1 $pid
-  return $?
-}
-
-force_stop() {
-  [ ! -e "$PIDFILE" ] && return
-  if running ; then
-    /bin/kill -15 $pid
-    sleep "$DIETIME"s
-    if running ; then
-      /bin/kill -9 $pid
-      sleep "$DIETIME"s
-      if running ; then
-        echo "Cannot kill $NAME (pid=$pid)!"
-        exit 1
-      fi
-    fi
-  fi
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC " "$NAME"
-    if running ;  then
-        log_progress_msg "apparently already running"
-        log_end_msg 0
-        exit 3
-    fi
-    if start_server ; then
-        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
-        if  running ;  then
-            log_end_msg 0
-        else
-            log_end_msg 1
-        fi
-    else
-        log_end_msg 1
-    fi
-    ;;
-  stop)
-    log_daemon_msg "Stopping $DESC" "$NAME"
-    if running ; then
-      errcode=0
-      stop_server || errcode=$?
-      log_end_msg $errcode
-    else
-      log_progress_msg "apparently not running"
-      log_end_msg 0
-      exit 0
-    fi
-    ;;
-  force-stop)
-    $0 stop
-    if running; then
-      log_daemon_msg "Stopping (force) $DESC" "$NAME"
-      errcode=0
-      force_stop || errcode=$?
-      log_end_msg $errcode
-    fi
-    ;;
-  restart|force-reload)
-    log_daemon_msg "Restarting $DESC" "$NAME"
-    errcode=0
-    stop_server || errcode=$?
-    [ -n "$DIETIME" ] && sleep $DIETIME
-    start_server || errcode=$?
-    [ -n "$STARTTIME" ] && sleep $STARTTIME
-    running || errcode=$?
-    log_end_msg $errcode
-    ;;
-  status)
-    log_daemon_msg "Checking status of $DESC" "$NAME"
-    if running ;  then
-      log_progress_msg "running"
-      log_end_msg 0
-    else
-      log_progress_msg "apparently not running"
-      log_end_msg 1
-      exit 1
-    fi
-    ;;
-  reload)
-    log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
-    log_warning_msg "cannot re-read the config file (use restart)."
-    ;;
-  *)
-    N=/etc/init.d/$NAME
-    echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
-    exit 1
-    ;;
-esac
-
-exit 0
-

data/distro/redhat/etc/chef/client.rb

@@ -1,16 +0,0 @@
-#
-# Chef Client Config File
-#
-
-log_level        :info
-ssl_verify_mode  :verify_none
-registration_url "http://127.0.0.1:4000"
-openid_url       "http://127.0.0.1:4001"
-template_url     "http://127.0.0.1:4000"
-remotefile_url   "http://127.0.0.1:4000"
-search_url       "http://127.0.0.1:4000"
-
-pid_file         "/var/run/chef/chef-client.pid"
-
-#interval	 1800
-#splay           0

data/distro/redhat/etc/chef/indexer.rb

@@ -1,10 +0,0 @@
-#
-# Chef Server Config File
-#
-
-log_level          :info
-search_index_path  "/var/lib/chef/search_index"
-
-Chef::Log::Formatter.show_time = false
-
-pid_file           "/var/run/chef/chef-indexer.pid"

data/distro/redhat/etc/chef/server.rb

@@ -1,22 +0,0 @@
-#
-# Chef Server Config File
-#
-
-log_level          :info
-ssl_verify_mode    :verify_none
-registration_url   "http://cserver:4000"
-openid_url         "http://cserver:4001"
-template_url       "http://cserver:4000"
-remotefile_url     "http://cserver:4000"
-search_url         "http://cserver:4000"
-cookbook_path      [ "/var/lib/chef/site-cookbooks", "/var/lib/chef/cookbooks" ]
-
-merb_root          "/var/lib/chef/merb"
-node_path          "/etc/chef/node"
-file_store_path    "/var/lib/chef/store"
-search_index_path  "/var/lib/chef/search_index"
-openid_store_path  "/var/lib/chef/openid/db"
-openid_cstore_path "/var/lib/chef/openid/cstore"
-file_cache_path    "/var/lib/chef/cache"
-
-Chef::Log::Formatter.show_time = false

data/distro/redhat/etc/init.d/chef-indexer

@@ -1,76 +0,0 @@
-#!/bin/bash
-# Startup script for chef-indexer
-#
-# chkconfig: - 75 25
-# description: Server component of the Chef systems integration framework.
-# processname: chef-indexer
-#
-# config: /etc/sysconfig/chef-indexer
-# pidfile: /var/run/chef/chef-indexer.pid
-
-# Source function library
-. /etc/init.d/functions
-
-[ -f /etc/sysconfig/chef-indexer ] && . /etc/sysconfig/chef-indexer
-
-prog="chef-indexer"
-PIDFILE=/var/run/chef/chef-indexer.pid
-LOCKFILE=/var/lock/subsys/$prog
-CONFIG=/etc/chef/indexer.rb
-USER="chef"
-GROUP="chef"
-LOGFILE=/var/log/chef/chef-indexer.log
-OPTIONS=
-
-start() {
-    echo -n "Starting $prog:"
-    daemon chef-indexer -d -c "$CONFIG" -u "$USER" -g "$GROUP" -L "$LOGFILE" "$OPTIONS" ">/dev/null"
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch ${LOCKFILE}
-    return $RETVAL
-}
-
-stop() {
-    echo -n "Stopping $prog: "
-    if [ -f $PIDFILE ]; then
-        killproc chef-indexer
-        RETVAL=$?
-        if [ $RETVAL -ne 0 ]; then
-            failure;
-        fi;
-    else
-        RETVAL=1
-        failure;
-    fi
-    rm -f $LOCKFILE
-    echo
-    return $RETVAL
-}
-
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart)
-        stop
-        start
-        ;;
-  condrestart)
-        if [ -f $LOCKFILE ]; then
-            stop
-            start
-        fi
-        ;;
-  status)
-        status chef-indexer
-        ;;
-  *)
-    echo "Usage: $0 {start|stop|restart|condrestart|status}"
-    exit 1
-esac
-
-exit $RETVAL

data/lib/chef/application/indexer.rb

@@ -1,141 +0,0 @@
-#
-# Author:: AJ Christensen (<aj@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.
-
-require 'chef/application'
-require 'chef/queue'
-require 'chef/search'
-require 'chef/search_index'
-require 'chef/config'
-require 'chef/daemon'
-require 'chef/log'
-
-
-class Chef::Application::Indexer < Chef::Application
-
-  option :config_file,
-    :short => "-c CONFIG",
-    :long  => "--config CONFIG",
-    :default => "/etc/chef/server.rb",
-    :description => "The configuration file to use"
-
-  option :log_level,
-    :short        => "-l LEVEL",
-    :long         => "--log_level LEVEL",
-    :description  => "Set the log level (debug, info, warn, error, fatal)",
-    :proc         => lambda { |l| l.to_sym }
-
-  option :log_location,
-    :short        => "-L LOGLOCATION",
-    :long         => "--logfile LOGLOCATION",
-    :description  => "Set the log file location, defaults to STDOUT - recommended for daemonizing",
-    :proc         => nil
-
-  option :help,
-    :short        => "-h",
-    :long         => "--help",
-    :description  => "Show this message",
-    :on           => :tail,
-    :boolean      => true,
-    :show_options => true,
-    :exit         => 0
-
-  option :user,
-    :short => "-u USER",
-    :long => "--user USER",
-    :description => "User to set privilege to",
-    :proc => nil
-
-  option :group,
-    :short => "-g GROUP",
-    :long => "--group GROUP",
-    :description => "Group to set privilege to",
-    :proc => nil
-
-  option :daemonize,
-    :short => "-d",
-    :long => "--daemonize",
-    :description => "Daemonize the process",
-    :proc => lambda { |p| true }
-
-  option :version,
-    :short        => "-v",
-    :long         => "--version",
-    :description  => "Show chef version",
-    :boolean      => true,
-    :proc         => lambda {|v| puts "Chef: #{::Chef::VERSION}"},
-    :exit         => 0
-
-  def initialize
-    super
-
-    @chef_search_indexer = nil
-  end
-
-  # Create a new search indexer and connect to the stomp queues
-  def setup_application
-    Chef::Daemon.change_privilege
-
-    @chef_search_indexer = Chef::SearchIndex.new
-    Chef::Queue.connect
-    Chef::Queue.subscribe(:queue, "index")
-    Chef::Queue.subscribe(:queue, "remove")
-  end
-
-  # Run the indexer, optionally daemonizing.
-  def run_application
-    if Chef::Config[:daemonize]
-      Chef::Daemon.daemonize("chef-indexer")
-    end
-
-    if Chef::Config[:queue_prefix]
-      queue_prefix = Chef::Config[:queue_prefix]
-      queue_partial_url = "/queue/#{queue_prefix}/chef"
-    else
-      queue_partial_url = "/queue/chef"
-    end
-
-    loop do
-      object, headers = Chef::Queue.receive_msg
-      Chef::Log.info("Headers #{headers.inspect}")
-      if headers["destination"] == "#{queue_partial_url}/index"
-        start_timer = Time.new
-        @chef_search_indexer.add(object)
-        @chef_search_indexer.commit
-        final_timer = Time.new
-        Chef::Log.info("Indexed object from #{headers['destination']} in #{final_timer - start_timer} seconds")
-      elsif headers["destination"] == "#{queue_partial_url}/remove"
-        start_timer = Time.new
-        @chef_search_indexer.delete(object)
-        @chef_search_indexer.commit
-        final_timer = Time.new
-        Chef::Log.info("Removed object from #{headers['destination']} in #{final_timer - start_timer} seconds")
-      end
-    end
-  rescue SystemExit => e
-    raise
-  rescue Exception => e
-    if Chef::Config[:interval]
-      Chef::Log.error("#{e.class}")
-      Chef::Log.fatal("#{e}\n#{e.backtrace.join("\n")}")
-      Chef::Log.fatal("Sleeping for #{Chef::Config[:delay]} seconds before trying again")
-      sleep Chef::Config[:delay]
-      retry
-    else
-      raise
-    end
-  end
-end

data/lib/chef/queue.rb

@@ -1,145 +0,0 @@
-#
-# 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.
-#
-
-require 'chef/mixin/params_validate'
-require 'json'
-require 'stomp'
-
-class Chef
-  class Queue
-
-    @client = nil
-    @queue_retry_delay = Chef::Config[:queue_retry_delay]
-    @queue_retry_count = Chef::Config[:queue_retry_count]
-
-    class << self
-      include Chef::Mixin::ParamsValidate
-
-      def connect
-        queue_user     = Chef::Config[:queue_user]
-        queue_password = Chef::Config[:queue_password]
-        queue_host = Chef::Config[:queue_host]
-        queue_port = Chef::Config[:queue_port]
-        queue_retries = 1 unless queue_retries
-
-        # Connection.open(login = "", passcode = "", host='localhost', port=61613, reliable=FALSE, reconnectDelay=5)
-        @client = Stomp::Connection.open(queue_user, queue_password, queue_host, queue_port, false)
-
-      rescue Errno::ECONNREFUSED
-        Chef::Log.error("Connection refused connecting to stomp queue at #{queue_host}:#{queue_port}, retry #{queue_retries}/#{@queue_retry_count}")
-        sleep(@queue_retry_delay)
-        retry if (queue_retries += 1) < @queue_retry_count
-        raise Errno::ECONNREFUSED, "Connection refused connecting to stomp queue at #{queue_host}:#{queue_port}, giving up"
-      rescue Timeout::Error
-        Chef::Log.error("Timeout connecting to stomp queue at #{queue_host}:#{queue_port}, retry #{queue_retries}/#{@queue_retry_count}")
-        sleep(@queue_retry_delay)
-        retry if (queue_retries += 1) < @queue_retry_count
-        raise Timeout::Error, "Timeout connecting to stomp queue at #{queue_host}:#{queue_port}, giving up"
-      else
-        queue_retries = 1 # reset the number of retries on success
-      end
-
-      def make_url(type, name)
-        validate(
-          {
-            :queue_type => type.to_sym,
-            :queue_name => name.to_sym,
-          },
-          {
-            :queue_type => {
-              :equal_to => [ :topic, :queue ],
-            },
-            :queue_name => {
-              :kind_of => [ String, Symbol ],
-            }
-          }
-        )
-        if Chef::Config[:queue_prefix]
-	        queue_prefix = Chef::Config[:queue_prefix]
-          queue_url = "/#{type}/#{queue_prefix}/chef/#{name}"
-	      else
-	        queue_url = "/#{type}/chef/#{name}"
-	      end
-	      queue_url
-      end
-
-      def subscribe(type, name)
-        queue_url = make_url(type, name)
-        Chef::Log.debug("Subscribing to #{queue_url}")
-        connect if @client == nil
-        @client.subscribe(queue_url)
-      end
-
-      def send_msg(type, name, msg)
-        queue_retries = 1 unless queue_retries
-        validate(
-          {
-            :message => msg,
-          },
-          {
-            :message => {
-              :respond_to => :to_json
-            }
-          }
-        )
-        queue_url = make_url(type, name)
-        json = msg.to_json
-        connect if @client == nil
-        Chef::Log.debug("Sending to #{queue_url}: #{json}")
-        begin
-          @client.send(queue_url, json)
-        rescue Errno::EPIPE
-          Chef::Log.debug("Lost connection to stomp queue, reconnecting")
-          connect
-          retry if (queue_retries += 1) < @queue_retry_count
-          raise Errno::EPIPE, "Lost connection to stomp queue, giving up"
-        else
-          queue_retries = 1 # reset the number of retries on success
-        end
-      end
-
-      def receive_msg
-        connect if @client == nil
-        begin
-          raw_msg = @client.receive()
-          Chef::Log.debug("Received Message from #{raw_msg.headers["destination"]} containing: #{raw_msg.body}")
-        rescue
-          Chef::Log.debug("Received nil message from stomp, retrying")
-          retry
-        end
-        msg = JSON.parse(raw_msg.body)
-        return msg, raw_msg.headers
-      end
-
-      def poll_msg
-        connect if @client == nil
-        raw_msg = @client.poll()
-        if raw_msg
-          msg = JSON.parse(raw_msg.body)
-        else
-          nil
-        end
-      end
-
-      def disconnect
-        raise ArgumentError, "You must call connect before you can disconnect!" unless @client
-        @client.disconnect
-      end
-    end
-  end
-end