[DRE-commits] r5446 - in trunk/chef/debian: . source
Joshua Timberman
jtimberman-guest at alioth.debian.org
Thu May 27 15:30:38 UTC 2010
Author: jtimberman-guest
Date: 2010-05-27 15:30:28 +0000 (Thu, 27 May 2010)
New Revision: 5446
Added:
trunk/chef/debian/source/
trunk/chef/debian/source/format
Removed:
trunk/chef/debian/chef-indexer.1
trunk/chef/debian/chef-indexer.dirs
trunk/chef/debian/chef-indexer.init
trunk/chef/debian/chef-indexer.logrotate
trunk/chef/debian/chef-indexer.manpages
trunk/chef/debian/chef-indexer.postrm
trunk/chef/debian/chef-server-slice.dirs
trunk/chef/debian/chef-server-slice.postrm
trunk/chef/debian/chef-server.init
trunk/chef/debian/chef-server.overrides
Modified:
trunk/chef/debian/chef-server-webui.config
trunk/chef/debian/chef-server-webui.postinst
trunk/chef/debian/chef-server.postinst
trunk/chef/debian/chef-solr.config
trunk/chef/debian/chef-solr.dirs
trunk/chef/debian/chef-solr.postinst
trunk/chef/debian/chef.config
trunk/chef/debian/chef.postinst
Log:
corrected pedantic lintian findings, removed old deprecated scripts
Deleted: trunk/chef/debian/chef-indexer.1
===================================================================
--- trunk/chef/debian/chef-indexer.1 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-indexer.1 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,42 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH CHEF-INDEXER: "1" "August 2009" "chef-indexer 0.7.8" "User Commands"
-.SH NAME
-chef-indexer: \- Runs the search index process.
-.SH SYNOPSIS
-.B chef-indexer
-\fI(options)\fR
-.SH DESCRIPTION
-.TP
-chef-indexer requires that the stompserver be started but at this time the stompserver package does not install a startup script, let alone start the daemon. I am working with the package maintainer for stompserver to include a startup script.
-\fB\-c\fR, \fB\-\-config\fR CONFIG
-The configuration file to use
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-Daemonize the process
-.TP
-\fB\-g\fR, \fB\-\-group\fR GROUP
-Group to change gid to before daemonizing
-.TP
-\fB\-l\fR, \fB\-\-log_level\fR LEVEL
-Set the log level (debug, info, warn, error, fatal)
-.TP
-\fB\-L\fR, \fB\-\-logfile\fR LOGLOCATION
-Set the log file location, defaults to STDOUT \- recommended for daemonizing
-.TP
-\fB\-u\fR, \fB\-\-user\fR USER
-User to change uid to before daemonizing
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show chef version
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.SH "SEE ALSO"
-Full documentation for Chef and chef-indexer is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.SH AUTHOR
-Chef was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man. Permission is granted
-to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
-
-On Debian systems, the complete text of the Apache 2.0 License can be found in
-/usr/share/common-licenses/Apache-2.0.
Deleted: trunk/chef/debian/chef-indexer.dirs
===================================================================
--- trunk/chef/debian/chef-indexer.dirs 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-indexer.dirs 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,3 +0,0 @@
-var/lib/chef/search_index
-var/log/chef
-etc/chef
Deleted: trunk/chef/debian/chef-indexer.init
===================================================================
--- trunk/chef/debian/chef-indexer.init 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-indexer.init 2010-05-27 15:30:28 UTC (rev 5446)
@@ -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 at 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
-
Deleted: trunk/chef/debian/chef-indexer.logrotate
===================================================================
--- trunk/chef/debian/chef-indexer.logrotate 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-indexer.logrotate 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,8 +0,0 @@
-/var/log/chef/indexer.log {
- rotate 12
- weekly
- compress
- postrotate
- /etc/init.d/chef-indexer force-reload
- endscript
-}
Deleted: trunk/chef/debian/chef-indexer.manpages
===================================================================
--- trunk/chef/debian/chef-indexer.manpages 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-indexer.manpages 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1 +0,0 @@
-debian/chef-indexer.1
Deleted: trunk/chef/debian/chef-indexer.postrm
===================================================================
--- trunk/chef/debian/chef-indexer.postrm 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-indexer.postrm 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,26 +0,0 @@
-#!/bin/sh
-# postrm script for chef-indexer
-#
-# see: dh_installdeb(1)
-
-set -e
-
-case "$1" in
- purge)
- rm -rf /var/log/chef/indexer*
- ;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/chef/debian/chef-server-slice.dirs
===================================================================
--- trunk/chef/debian/chef-server-slice.dirs 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-server-slice.dirs 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,6 +0,0 @@
-var/cache/chef
-var/lib/chef/cookbooks
-var/lib/chef/openid
-var/lib/chef/search_index
-usr/share/doc/chef-server-slice
-usr/share/chef-server-slice/app
Deleted: trunk/chef/debian/chef-server-slice.postrm
===================================================================
--- trunk/chef/debian/chef-server-slice.postrm 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-server-slice.postrm 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,26 +0,0 @@
-#!/bin/sh
-# postrm script for chef-server-slice
-#
-# see: dh_installdeb(1)
-
-set -e
-
-case "$1" in
- remove)
- rm -rf /var/cache/chef
- ;;
- purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/chef/debian/chef-server-webui.config
===================================================================
--- trunk/chef/debian/chef-server-webui.config 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-server-webui.config 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -e
. /usr/share/debconf/confmodule
Modified: trunk/chef/debian/chef-server-webui.postinst
===================================================================
--- trunk/chef/debian/chef-server-webui.postinst 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-server-webui.postinst 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -e
. /usr/share/debconf/confmodule
. /etc/default/chef-server-webui
Deleted: trunk/chef/debian/chef-server.init
===================================================================
--- trunk/chef/debian/chef-server.init 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-server.init 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,120 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: chef-server
-# Required-Start: $network
-# Required-Stop: $network
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start a chef-server.
-### END INIT INFO
-#
-# Copyright (c) 2009 Joshua Timberman, <joshua at opscode.com>
-#
-# chef-server Startup script for chef-server.
-# chkconfig: - 98 02
-# description: starts up chef-server webui.
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-server
-PIDFILE=/var/run/chef/server.%s.pid
-MAINPID=/var/run/chef/server.main.pid
-LOGFILE=/var/log/chef/merb.%s.log
-MASTER=master
-NAME=chef-server
-DESC=chef-server
-DAEMON_OPTS="-d -c2 -P $PIDFILE -L $LOGFILE"
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -d /var/run/chef ]; then
- mkdir /var/run/chef
-fi
-
-running() {
- [ ! -f "$MAINPID" ] && return 1
- pid=`cat $MAINPID`
- name=$MASTER
- [ -z "$pid" ] && return 1
- [ ! -d /proc/$pid ] && return 1
- cmd=`cat /proc/$pid/cmdline | tr '\000' '\n' | head -1 | awk -F:\ '{print $3}'`
- [ "$cmd" != "$name" ] && return 1
- return 0
-}
-
-start_server() {
- $DAEMON $DAEMON_OPTS
- errcode=$?
- return $errcode
-}
-
-stop_server() {
- $DAEMON -K all -P $PIDFILE
- errcode=$?
- return $errcode
-}
-
-reload_server() {
- stop_server
- start_server
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC "
- if running ; then
- log_progress_msg "apparently already running"
- log_end_msg 0
- exit 0
- fi
- if start_server ; then
- sleep 1
- 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"
- 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
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC"
- errcode=0
- reload_server
- running && errcode=$?
- log_end_msg $errcode
- ;;
- status)
- log_daemon_msg "Checking status of $DESC"
- if running ; then
- log_progress_msg "running"
- log_end_msg 0
- else
- log_progress_msg "apparently not running"
- log_end_msg 1
- exit 3
- fi
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|status}" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
Deleted: trunk/chef/debian/chef-server.overrides
===================================================================
--- trunk/chef/debian/chef-server.overrides 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-server.overrides 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,2 +0,0 @@
-# jquery package from Karmic is untested with chef-server and is pending upstream review.
-W: chef-server: embedded-javascript-library usr/share/chef-server/public/javascripts/jquery.js
Modified: trunk/chef/debian/chef-server.postinst
===================================================================
--- trunk/chef/debian/chef-server.postinst 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-server.postinst 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -e
. /usr/share/debconf/confmodule
. /etc/default/chef-server
Modified: trunk/chef/debian/chef-solr.config
===================================================================
--- trunk/chef/debian/chef-solr.config 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-solr.config 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -e
. /usr/share/debconf/confmodule
Modified: trunk/chef/debian/chef-solr.dirs
===================================================================
--- trunk/chef/debian/chef-solr.dirs 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-solr.dirs 2010-05-27 15:30:28 UTC (rev 5446)
@@ -7,7 +7,6 @@
var/lib/chef/solr/solr-jetty/solr/WEB-INF
var/cache/chef/solr/data
var/log/chef
-var/run/chef
etc/chef
etc/chef/solr-jetty
usr/sbin
Modified: trunk/chef/debian/chef-solr.postinst
===================================================================
--- trunk/chef/debian/chef-solr.postinst 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef-solr.postinst 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -e
. /usr/share/debconf/confmodule
. /etc/default/chef-solr
Modified: trunk/chef/debian/chef.config
===================================================================
--- trunk/chef/debian/chef.config 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef.config 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -e
. /usr/share/debconf/confmodule
Modified: trunk/chef/debian/chef.postinst
===================================================================
--- trunk/chef/debian/chef.postinst 2010-05-27 10:50:18 UTC (rev 5445)
+++ trunk/chef/debian/chef.postinst 2010-05-27 15:30:28 UTC (rev 5446)
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -e
. /usr/share/debconf/confmodule
Added: trunk/chef/debian/source/format
===================================================================
--- trunk/chef/debian/source/format (rev 0)
+++ trunk/chef/debian/source/format 2010-05-27 15:30:28 UTC (rev 5446)
@@ -0,0 +1 @@
+1.0
More information about the Pkg-ruby-extras-commits
mailing list