[DRE-commits] r5670 - in trunk/chef/debian: . etc/chef patches po
Joshua Timberman
jtimberman-guest at alioth.debian.org
Tue Jul 6 19:45:44 UTC 2010
Author: jtimberman-guest
Date: 2010-07-06 19:45:38 +0000 (Tue, 06 Jul 2010)
New Revision: 5670
Added:
trunk/chef/debian/chef-server-api.chef-server.default
trunk/chef/debian/chef-server-api.chef-server.init
trunk/chef/debian/chef-server-api.logrotate
trunk/chef/debian/chef-server-api.manpages
trunk/chef/debian/chef-server-api.postinst
trunk/chef/debian/patches/CHEF-1404.patch
trunk/chef/debian/patches/chef_server_load_path.patch
trunk/chef/debian/po/cs.po
trunk/chef/debian/po/da.po
trunk/chef/debian/po/fr.po
trunk/chef/debian/po/pt.po
trunk/chef/debian/po/ru.po
trunk/chef/debian/po/sv.po
Removed:
trunk/chef/debian/chef-server.chef-server.default
trunk/chef/debian/chef-server.chef-server.init
trunk/chef/debian/chef-server.dirs
trunk/chef/debian/chef-server.links
trunk/chef/debian/chef-server.logrotate
trunk/chef/debian/chef-server.manpages
trunk/chef/debian/chef-server.postinst
trunk/chef/debian/chef-server.postrm
trunk/chef/debian/etc/chef/indexer.rb
trunk/chef/debian/patches/fix_slice_dirs.patch
Modified:
trunk/chef/debian/changelog
trunk/chef/debian/chef-client.init
trunk/chef/debian/chef-server-api.dirs
trunk/chef/debian/chef-server-api.postrm
trunk/chef/debian/chef-server-webui.chef-server-webui.init
trunk/chef/debian/control
trunk/chef/debian/etc/chef/server.rb
trunk/chef/debian/patches/series
trunk/chef/debian/patches/solr_load_path.patch
trunk/chef/debian/rules
trunk/chef/debian/watch
Log:
sync packaging from opscode upstream for 0.9.6+dfsg-2
Modified: trunk/chef/debian/changelog
===================================================================
--- trunk/chef/debian/changelog 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/changelog 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,5 +1,88 @@
-chef (0.8.16-4) UNRELEASED; urgency=low
+chef (0.9.6+dfsg-2) unstable; urgency=low
+ * debian/control: libchef-ruby1.8 should depend on libuuidtools-ruby1.8
+
+ -- Joshua Timberman <joshua at opscode.com> Tue, 06 Jul 2010 11:04:41 -0600
+
+chef (0.9.6+dfsg-1) unstable; urgency=low
+
+ * New upstream release (0.9.6).
+ * Upstream release fixes CHEF-1404, quilt patch removed.
+
+ -- Joshua Timberman <joshua at opscode.com> Fri, 02 Jul 2010 15:52:34 -0600
+
+chef (0.9.4+dfsg-2) unstable; urgency=low
+
+ * Quilt patch for CHEF-1404.
+
+ -- Joshua Timberman <joshua at opscode.com> Fri, 02 Jul 2010 10:39:49 -0600
+
+chef (0.9.4+dfsg-1) unstable; urgency=low
+
+ * New upstream release (0.9.4).
+ * debian/watch: handle +dfsg in debian version.
+
+ -- Joshua Timberman <joshua at opscode.com> Tue, 29 Jun 2010 19:19:08 -0600
+
+chef (0.9.2+dfsg-2) unstable; urgency=low
+
+ * debian/control: alternatively install libgems-ruby1.8 to satisfy rubygems
+
+ -- Joshua Timberman <joshua at opscode.com> Tue, 29 Jun 2010 17:16:54 -0600
+
+chef (0.9.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release (0.9.2).
+ * quilt patch: chef_server_load_path.patch
+ - fix merb-core attempting to load json gem (chef loads json anyway).
+
+ -- Joshua Timberman <joshua at opscode.com> Tue, 29 Jun 2010 10:01:55 -0600
+
+chef (0.9.0-5) unstable; urgency=low
+
+ * debian/etc/chef/server.rb missing sandbox_path and checksum_path options
+ to handle sandboxed cookbook uploads properly.
+ * quilt patch: solr_load_path.patch
+ - fix solr library location for chef-server controller.
+
+ -- Joshua Timberman <joshua at opscode.com> Mon, 28 Jun 2010 20:55:09 -0600
+
+chef (0.9.0-4) unstable; urgency=low
+
+ * quilt patch: chef_server_load_path.patch
+ - fix daemon location for chef-server-api, chef-server-webui
+
+ -- Joshua Timberman <joshua at opscode.com> Mon, 28 Jun 2010 16:05:14 -0600
+
+chef (0.9.0-3) unstable; urgency=low
+
+ * chef-server-api init and default named incorrectly.
+
+ -- Joshua Timberman <joshua at opscode.com> Mon, 28 Jun 2010 15:46:49 -0600
+
+chef (0.9.0-2) unstable; urgency=low
+
+ * debian/control: add missing librestclient-ruby dependency
+
+ -- Joshua Timberman <joshua at opscode.com> Mon, 28 Jun 2010 13:37:39 -0600
+
+chef (0.9.0-1) unstable; urgency=low
+
+ * New upstream release (0.9).
+ * debian/control: depend on rubygems due to Chef provider for gem_package
+ loading unconditionally.
+ * patches/remove_rubygems.patch: remove due to rubygems being a dependency.
+
+ -- Joshua Timberman <joshua at opscode.com> Sun, 13 Jun 2010 09:26:22 -0600
+
+chef (0.8.16-5) unstable; urgency=low
+
+ * chef-client.init pidfile location (Closes: #584816)
+
+ -- Joshua Timberman <joshua at opscode.com> Wed, 09 Jun 2010 02:00:10 -0600
+
+chef (0.8.16-4) unstable; urgency=low
+
* chef-client runs as root, create the pid file in /var/run.
-- Joshua Timberman <joshua at opscode.com> Sun, 23 May 2010 19:05:21 -0600
Modified: trunk/chef/debian/chef-client.init
===================================================================
--- trunk/chef/debian/chef-client.init 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-client.init 2010-07-06 19:45:38 UTC (rev 5670)
@@ -18,7 +18,7 @@
DAEMON=/usr/bin/chef-client
NAME=chef-client
DESC=chef-client
-PIDFILE=/var/run/chef-client.pid
+PIDFILE=/var/run/chef/client.pid
test -x $DAEMON || exit 0
Added: trunk/chef/debian/chef-server-api.chef-server.default
===================================================================
--- trunk/chef/debian/chef-server-api.chef-server.default (rev 0)
+++ trunk/chef/debian/chef-server-api.chef-server.default 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,6 @@
+LOGFILE=/var/log/chef/server.log
+CONFIG=/etc/chef/server.rb
+ADAPTER=thin
+PORT=4000
+USER=chef
+GROUP=chef
Added: trunk/chef/debian/chef-server-api.chef-server.init
===================================================================
--- trunk/chef/debian/chef-server-api.chef-server.init (rev 0)
+++ trunk/chef/debian/chef-server-api.chef-server.init 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,120 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: chef-server
+# Required-Start: $remote_fs $network rabbitmq-server couchdb
+# Required-Stop: $remote_fs $network rabbitmq-server couchdb
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Start a chef-server.
+### END INIT INFO
+#
+# Copyright (c) 2009-2010 Opscode, Inc <legal at opscode.com>
+#
+# chef-server Startup script for chef-server.
+# chkconfig: - 90 02
+# description: starts up chef-server webui.
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/chef-server
+PIDFILE=/var/run/chef/server.%s.pid
+MAINPID=/var/run/chef/server.main.pid
+NAME=chef-server
+DESC=chef-server
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+if [ ! -d /var/run/chef ]; then
+ mkdir /var/run/chef
+ chown $USER:$GROUP /var/run/chef
+fi
+
+DAEMON_OPTS="-p $PORT -e production -d -a $ADAPTER -P $PIDFILE -L $LOGFILE -C $CONFIG -u $USER -G $GROUP"
+
+running() {
+ [ ! -f "$MAINPID" ] && return 1
+ pid=`cat $MAINPID`
+ [ -z "$pid" ] && return 1
+ [ ! -d /proc/$pid ] && return 1
+ (ps -fp $pid | egrep -q "merb.*(merb : master|worker.*$PORT)") || 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
+
Modified: trunk/chef/debian/chef-server-api.dirs
===================================================================
--- trunk/chef/debian/chef-server-api.dirs 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server-api.dirs 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,4 +1,8 @@
var/cache/chef
var/lib/chef/cookbooks
-usr/share/doc/chef-server-api
-usr/share/chef-server-api/app
+var/log/chef
+usr/share/doc/chef-server
+usr/share/chef-server
+etc/chef
+etc/chef/certificates
+usr/bin
Added: trunk/chef/debian/chef-server-api.logrotate
===================================================================
--- trunk/chef/debian/chef-server-api.logrotate (rev 0)
+++ trunk/chef/debian/chef-server-api.logrotate 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,8 @@
+/var/log/chef/server.log /var/log/chef/merb*log {
+ rotate 12
+ weekly
+ compress
+ postrotate
+ /usr/sbin/invoke-rc.d chef-server force-reload > /dev/null
+ endscript
+}
Added: trunk/chef/debian/chef-server-api.manpages
===================================================================
--- trunk/chef/debian/chef-server-api.manpages (rev 0)
+++ trunk/chef/debian/chef-server-api.manpages 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,2 @@
+debian/chef-server.1
+debian/chef-server-webui.1
Added: trunk/chef/debian/chef-server-api.postinst
===================================================================
--- trunk/chef/debian/chef-server-api.postinst (rev 0)
+++ trunk/chef/debian/chef-server-api.postinst 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,55 @@
+#!/bin/bash
+set -e
+
+. /usr/share/debconf/confmodule
+. /etc/default/chef-server
+
+export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
+
+TEMPLATE=/usr/share/chef-server-api/server.rb
+TMPDIR=`mktemp -d` # used for holding temp files
+TMPFILE=`mktemp -p ${TMPDIR}` # used for holding rendered template
+CONFIGFILE=/etc/chef/server.rb
+
+case "$1" in
+ configure)
+ db_get chef-solr/amqp_password && amqp_pass="$RET"
+ tsed=`mktemp -p ${TMPDIR}`
+ cat << EOF > $tsed
+s/^amqp_pass \".*\"/amqp_pass \"${amqp_pass}\"/g
+EOF
+ if [ ! -z "$amqp_pass" ]; then
+ sed -f $tsed $TEMPLATE > $TMPFILE
+ fi
+ ucf --debconf-ok $TMPFILE $CONFIGFILE
+ test -f $CONFIGFILE && chmod 0640 $CONFIGFILE
+ rm -rf $TMPDIR
+ if ! getent passwd chef > /dev/null; then
+ adduser --system --quiet \
+ --home /var/lib/chef --no-create-home \
+ --shell /bin/false --group --gecos "Chef Daemon" chef
+ fi
+ chown -R $USER:$GROUP /etc/chef
+ chown -R $USER:$GROUP /var/lib/chef
+ chown -R $USER:$GROUP /var/log/chef
+ chown -R $USER:$GROUP /var/cache/chef
+ chown -R $USER:$GROUP /var/run/chef
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+db_stop
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/chef/debian/chef-server-api.postrm
===================================================================
--- trunk/chef/debian/chef-server-api.postrm 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server-api.postrm 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,16 +1,24 @@
#!/bin/sh
-# postrm script for chef-server-slice
+# postrm script for chef-server-api
#
# see: dh_installdeb(1)
set -e
+TEMPLATE=/usr/share/chef/server.rb
+CONFIGFILE=/etc/chef/server.rb
+
case "$1" in
remove)
- rm -rf /var/cache/chef
;;
- purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ purge)
+ rm -rf /var/log/chef/server.log*
+ rm -rf /var/log/chef/merb.log*
+ test -x /usr/bin/ucf && ucf --purge $TEMPLATEFILE $CONFIGFILE
+ rm -rf $CONFIGFILE $CONFIGFILE.ucf-old $CONFIGFILE.ucf-new $CONFIGFILE.ucf-dist
;;
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
*)
echo "postrm called with unknown argument \`$1'" >&2
Modified: trunk/chef/debian/chef-server-webui.chef-server-webui.init
===================================================================
--- trunk/chef/debian/chef-server-webui.chef-server-webui.init 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server-webui.chef-server-webui.init 2010-07-06 19:45:38 UTC (rev 5670)
@@ -15,7 +15,7 @@
# description: starts up chef-server webui.
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-server-webui
+DAEMON=/usr/sbin/chef-server-webui
PIDFILE=/var/run/chef/server-webui.%s.pid
MAINPID=/var/run/chef/server-webui.main.pid
NAME=chef-server-webui
Deleted: trunk/chef/debian/chef-server.chef-server.default
===================================================================
--- trunk/chef/debian/chef-server.chef-server.default 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server.chef-server.default 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,6 +0,0 @@
-LOGFILE=/var/log/chef/server.log
-CONFIG=/etc/chef/server.rb
-ADAPTER=thin
-PORT=4000
-USER=chef
-GROUP=chef
Deleted: trunk/chef/debian/chef-server.chef-server.init
===================================================================
--- trunk/chef/debian/chef-server.chef-server.init 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server.chef-server.init 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,120 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: chef-server
-# Required-Start: $remote_fs $network rabbitmq-server couchdb
-# Required-Stop: $remote_fs $network rabbitmq-server couchdb
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start a chef-server.
-### END INIT INFO
-#
-# Copyright (c) 2009-2010 Opscode, Inc <legal at opscode.com>
-#
-# chef-server Startup script for chef-server.
-# chkconfig: - 90 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
-NAME=chef-server
-DESC=chef-server
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-if [ ! -d /var/run/chef ]; then
- mkdir /var/run/chef
- chown $USER:$GROUP /var/run/chef
-fi
-
-DAEMON_OPTS="-p $PORT -e production -d -a $ADAPTER -P $PIDFILE -L $LOGFILE -C $CONFIG -u $USER -G $GROUP"
-
-running() {
- [ ! -f "$MAINPID" ] && return 1
- pid=`cat $MAINPID`
- [ -z "$pid" ] && return 1
- [ ! -d /proc/$pid ] && return 1
- (ps -fp $pid | egrep -q "merb.*(merb : master|worker.*$PORT)") || 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.dirs
===================================================================
--- trunk/chef/debian/chef-server.dirs 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server.dirs 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,8 +0,0 @@
-var/cache/chef
-var/lib/chef/cookbooks
-var/log/chef
-usr/share/doc/chef-server
-usr/share/chef-server
-etc/chef
-etc/chef/certificates
-usr/bin
Deleted: trunk/chef/debian/chef-server.links
===================================================================
--- trunk/chef/debian/chef-server.links 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server.links 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1 +0,0 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/chef-server/public/javascripts/jquery.js
Deleted: trunk/chef/debian/chef-server.logrotate
===================================================================
--- trunk/chef/debian/chef-server.logrotate 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server.logrotate 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,8 +0,0 @@
-/var/log/chef/server.log /var/log/chef/merb*log {
- rotate 12
- weekly
- compress
- postrotate
- /usr/sbin/invoke-rc.d chef-server force-reload > /dev/null
- endscript
-}
Deleted: trunk/chef/debian/chef-server.manpages
===================================================================
--- trunk/chef/debian/chef-server.manpages 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server.manpages 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,2 +0,0 @@
-debian/chef-server.1
-debian/chef-server-webui.1
Deleted: trunk/chef/debian/chef-server.postinst
===================================================================
--- trunk/chef/debian/chef-server.postinst 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server.postinst 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,55 +0,0 @@
-#!/bin/bash
-set -e
-
-. /usr/share/debconf/confmodule
-. /etc/default/chef-server
-
-export PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin
-
-TEMPLATE=/usr/share/chef-server/server.rb
-TMPDIR=`mktemp -d` # used for holding temp files
-TMPFILE=`mktemp -p ${TMPDIR}` # used for holding rendered template
-CONFIGFILE=/etc/chef/server.rb
-
-case "$1" in
- configure)
- db_get chef-solr/amqp_password && amqp_pass="$RET"
- tsed=`mktemp -p ${TMPDIR}`
- cat << EOF > $tsed
-s/^amqp_pass \".*\"/amqp_pass \"${amqp_pass}\"/g
-EOF
- if [ ! -z "$amqp_pass" ]; then
- sed -f $tsed $TEMPLATE > $TMPFILE
- fi
- ucf --debconf-ok $TMPFILE $CONFIGFILE
- test -f $CONFIGFILE && chmod 0640 $CONFIGFILE
- rm -rf $TMPDIR
- if ! getent passwd chef > /dev/null; then
- adduser --system --quiet \
- --home /var/lib/chef --no-create-home \
- --shell /bin/false --group --gecos "Chef Daemon" chef
- fi
- chown -R $USER:$GROUP /etc/chef
- chown -R $USER:$GROUP /var/lib/chef
- chown -R $USER:$GROUP /var/log/chef
- chown -R $USER:$GROUP /var/cache/chef
- chown -R $USER:$GROUP /var/run/chef
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-db_stop
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/chef/debian/chef-server.postrm
===================================================================
--- trunk/chef/debian/chef-server.postrm 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/chef-server.postrm 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,34 +0,0 @@
-#!/bin/sh
-# postrm script for chef-server
-#
-# see: dh_installdeb(1)
-
-set -e
-
-TEMPLATE=/usr/share/chef/server.rb
-CONFIGFILE=/etc/chef/server.rb
-
-case "$1" in
- remove)
- ;;
- purge)
- rm -rf /var/log/chef/server.log*
- rm -rf /var/log/chef/merb.log*
- test -x /usr/bin/ucf && ucf --purge $TEMPLATEFILE $CONFIGFILE
- rm -rf $CONFIGFILE $CONFIGFILE.ucf-old $CONFIGFILE.ucf-new $CONFIGFILE.ucf-dist
- ;;
- 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/control
===================================================================
--- trunk/chef/debian/control 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/control 2010-07-06 19:45:38 UTC (rev 5670)
@@ -10,7 +10,7 @@
Package: chef
Architecture: all
-Depends: ${misc:Depends}, ruby1.8, liberubis-ruby1.8, libjson-ruby1.8, libextlib-ruby1.8 (>= 0.9.13), ohai (>= 0.4.0), libchef-ruby1.8 (= ${source:Version}), libopenssl-ruby1.8, libmixlib-authentication-ruby1.8 (>= 1.1.0), ucf
+Depends: ${misc:Depends}, ruby1.8, liberubis-ruby1.8, libjson-ruby1.8, libextlib-ruby1.8 (>= 0.9.13), ohai (>= 0.4.0), libchef-ruby1.8 (= ${source:Version}), libopenssl-ruby1.8, libmixlib-authentication-ruby1.8 (>= 1.1.0), ucf, libhighline-ruby1.8
Recommends: irb1.8
Description: System integration framework written in Ruby
Chef is a systems integration framework and configuration management library
@@ -40,10 +40,10 @@
Package: chef-server
Architecture: all
-Depends: ${misc:Depends}, ruby, merb-slices, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, chef-server-api (= ${source:Version}), chef-solr (= ${source:Version}), thin, libjson-ruby, libchef-ruby (= ${source:Version}), libuuidtools-ruby1.8, adduser, libjs-jquery (>= 1.3.2), ucf
+Depends: ${misc:Depends}, ruby, chef-server-api (= ${source:Version}), chef-server-webui (= ${source:Version}), chef-solr (= ${source:Version})
Recommends: chef (= ${source:Version})
-Suggests: nginx, apache2, rake, chef-server-webui (=${source:Version})
-Description: Merb application providing centralized management for Chef
+Suggests: nginx, apache2, rake
+Description: Meta package that depends on Chef Server API and WebUI
Chef is a systems integration framework and configuration management system
written in Ruby. Chef provides a Ruby library and API that can be used to
bring the benefits of configuration management to an entire infrastructure.
@@ -55,11 +55,12 @@
The chef-server package provides a merb binary wrapper that loads up the
chef-server-api application.
.
- This package contains the chef-server Merb application and associated files.
+ This package is a meta package that depends on chef-server-api and
+ chef-server-webui to provide both Server components.
Package: chef-server-api
Architecture: all
-Depends: ${misc:Depends}, ruby, merb-slices, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, rabbitmq-server (>= 1.6), couchdb (>= 0.9.1), thin, libjson-ruby, libchef-ruby (= ${source:Version})
+Depends: ${misc:Depends}, ruby, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, rabbitmq-server (>= 1.6), couchdb (>= 0.9.1), thin, libjson-ruby, libchef-ruby (= ${source:Version}), chef-solr (= ${source:Version}), adduser, ucf
Recommends: chef (= ${source:Version})
Replaces: chef-server-slice
Conflicts: chef-server-slice
@@ -110,8 +111,8 @@
Package: libchef-ruby1.8
Architecture: all
-Depends: ${misc:Depends}, ruby1.8, libopenssl-ruby1.8, libmixlib-authentication-ruby1.8 (>= 1.1.0), libmixlib-cli-ruby1.8 (>= 1.1.0), libmixlib-config-ruby1.8 (>= 1.1.0), libmixlib-log-ruby1.8 (>= 1.1.0), libohai-ruby1.8 (>= 0.4.0), libmoneta-ruby1.8, libbunny-ruby1.8
-Recommends: ohai (>= 0.4.0), chef (= ${source:Version}), rubygems1.8
+Depends: ${misc:Depends}, ruby1.8, libopenssl-ruby1.8, libmixlib-authentication-ruby1.8 (>= 1.1.0), libmixlib-cli-ruby1.8 (>= 1.1.0), libmixlib-config-ruby1.8 (>= 1.1.0), libmixlib-log-ruby1.8 (>= 1.1.0), libohai-ruby1.8 (>= 0.4.0), libmoneta-ruby1.8, libbunny-ruby1.8, rubygems1.8 | libgems-ruby1.8, librestclient-ruby1.8, libuuidtools-ruby1.8
+Recommends: ohai (>= 0.4.0), chef (= ${source:Version})
Suggests: rake, libshadow-ruby1.8
Description: Ruby 1.8 libraries for Chef system integration framework
Chef is a systems integration framework and configuration management library
Deleted: trunk/chef/debian/etc/chef/indexer.rb
===================================================================
--- trunk/chef/debian/etc/chef/indexer.rb 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/etc/chef/indexer.rb 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,43 +0,0 @@
-# Configuration File For Chef Indexer (chef-indexer)
-#
-# The chef-indexer program runs on the Chef Server to generate search indexes
-# of node data stored in the Server's CouchDB store. Currently, the search
-# uses ferret, a pure-Ruby search library. In a future version of Chef this
-# will change, so please be aware.
-#
-# Chef uses a Ruby DSL for configuration, and this file may contain some
-# Ruby idioms. First, symbols. These are designated by a colon sigil, ie,
-# :value. Second, in Ruby, everything but false and nil (no quotes or other
-# designations) is true, including true, the integer 0 and the string "false".
-# So to set the value of a setting to false, write:
-#
-# some_setting false
-#
-# Third, Ruby class methods can be used, for example we tell the log to show
-# the current time stamp with Chef::Log::Formatter.show_time, below.
-#
-# log_location specifies where the indexer should log to.
-# valid values are: a quoted string specifying a file, or STDOUT with
-# no quotes. When run as a daemon (default), STDOUT will produce no output.
-
-log_location "/var/log/chef/indexer.log"
-
-# search_index_path specifies where the indexer should store the indexes.
-# valid value is any filesystem directory location.
-
-search_index_path "/var/lib/chef/search_index"
-
-# pid_file specifies the location of where chef-indexer daemon should keep the
-# pid file.
-# valid value is any filesystem file location.
-
-pid_file "/var/run/chef/indexer.pid"
-
-# Chef::Log::Formatter.show_time specifies whether the chef-client log should
-# contain timestamps.
-# valid values are true or false (no quotes, see above about Ruby idioms). The
-# printed timestamp is rfc2822, for example:
-# Fri, 31 Jul 2009 19:19:46 -0600
-
-Chef::Log::Formatter.show_time = true
-
Modified: trunk/chef/debian/etc/chef/server.rb
===================================================================
--- trunk/chef/debian/etc/chef/server.rb 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/etc/chef/server.rb 2010-07-06 19:45:38 UTC (rev 5670)
@@ -65,6 +65,11 @@
cookbook_tarball_path "/var/lib/chef/cookbook-tarballs"
+# sandbox_path is the location where the chef server temporarily stores files
+# uploaded for cookbooks.
+
+sandbox_path "/var/cache/chef/sandboxes"
+
# file_cache_path specifies where chef should cache cookbooks, server
# cookie ID, and openid registration data.
# valid value is any filesystem directory location.
@@ -74,7 +79,7 @@
# node_path specifies a location for where to find node-specific recipes.
# valid values are any filesystem direcory location.
-#node_path "/var/lib/chef/nodes"
+node_path "/var/lib/chef/nodes"
# openid_store_path specifies a location where to keep openid nonces for clients.
# valid values are any filesystem directory location.
@@ -113,6 +118,10 @@
cache_options({ :path => "/var/cache/chef/checksums", :skip_expires => true})
+# checksum_path sets the location for file checksums on sandbox uploads.
+
+checksum_path "/var/cache/chef/checksums"
+
# Mixlib::Log::Formatter.show_time specifies whether the chef-client log should
# contain timestamps.
# valid values are true or false. The printed timestamp is rfc2822, for example:
Added: trunk/chef/debian/patches/CHEF-1404.patch
===================================================================
--- trunk/chef/debian/patches/CHEF-1404.patch (rev 0)
+++ trunk/chef/debian/patches/CHEF-1404.patch 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,18 @@
+# Description: Fixes shef crashing on startup about resources not found.
+# Fixed upstream for next Chef version release.
+Index: chef-0.9.4+dfsg/chef/lib/chef/shef/ext.rb
+===================================================================
+--- chef-0.9.4+dfsg.orig/chef/lib/chef/shef/ext.rb 2010-07-02 10:40:24.000000000 -0600
++++ chef-0.9.4+dfsg/chef/lib/chef/shef/ext.rb 2010-07-02 10:40:57.000000000 -0600
+@@ -15,6 +15,11 @@
+ # limitations under the License.
+ #
+
++require 'chef/recipe'
++require 'fileutils'
++require 'chef/version'
++require 'chef/shef/shef_session'
++
+ module Shef
+ module Extensions
+
Added: trunk/chef/debian/patches/chef_server_load_path.patch
===================================================================
--- trunk/chef/debian/patches/chef_server_load_path.patch (rev 0)
+++ trunk/chef/debian/patches/chef_server_load_path.patch 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,43 @@
+# Description: fixes the chef-server daemons to disable Merb's json loading
+# and sets the full path to the libraries for the merb apps for the api and
+# webui. no plans for Upstream to change this.
+Index: chef-0.9.0/chef-server-api/bin/chef-server
+===================================================================
+--- chef-0.9.0.orig/chef-server-api/bin/chef-server 2010-06-29 08:14:13.000000000 -0600
++++ chef-0.9.0/chef-server-api/bin/chef-server 2010-06-29 09:43:15.000000000 -0600
+@@ -22,13 +22,14 @@
+
+ require "rubygems"
+ require "merb-core"
++Merb.disable(:json)
+
+ # Load chef and chef-server-api from source rather than gem, if present
+ $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib/'))
+ $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+
+ require 'chef'
+-require 'chef-server-api'
++require '/usr/share/chef-server-api/lib/chef-server-api'
+
+ # Ensure the chef gem we load is the same version as the chef server
+ unless defined?(Chef)
+Index: chef-0.9.0/chef-server-webui/bin/chef-server-webui
+===================================================================
+--- chef-0.9.0.orig/chef-server-webui/bin/chef-server-webui 2010-06-29 08:14:13.000000000 -0600
++++ chef-0.9.0/chef-server-webui/bin/chef-server-webui 2010-06-29 09:56:55.000000000 -0600
+@@ -25,13 +25,14 @@
+
+ require "rubygems"
+ require "merb-core"
++Merb.disable(:json)
+
+ # Load chef and chef-server-api from source rather than gem, if present
+ $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib'))
+ $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+
+ require 'chef'
+-require 'chef-server-webui'
++require '/usr/share/chef-server-webui/lib/chef-server-webui'
+
+ if ARGV[0] && ARGV[0] =~ /^[^-]/
+ ARGV.push "-H"
Deleted: trunk/chef/debian/patches/fix_slice_dirs.patch
===================================================================
--- trunk/chef/debian/patches/fix_slice_dirs.patch 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/patches/fix_slice_dirs.patch 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,20 +0,0 @@
-# Description: Because we're not using the typical rubygems method of running
-# Chef, the slice needs to manually load its root directory and the location of
-# controllers and views.
-# No upstream patch/ticket filed yet, still discussing how we're going to
-# approach this to be applicable to other platforms than Debian/Ubuntu.
-Index: chef-0.7.8/chef-server-slice/lib/chef-server-slice.rb
-===================================================================
---- chef-0.7.8.orig/chef-server-slice/lib/chef-server-slice.rb 2009-08-20 14:49:40.284071125 -0600
-+++ chef-0.7.8/chef-server-slice/lib/chef-server-slice.rb 2009-08-20 14:50:15.740499619 -0600
-@@ -33,6 +33,10 @@
- # Stub classes loaded hook - runs before LoadClasses BootLoader
- # right after a slice's classes have been loaded internally.
- def self.loaded
-+ ChefServerSlice.root = "/usr/share/chef-server-slice"
-+ Merb.push_path(:controller, ChefServerSlice.root / "app" / "controllers", "**/*.rb")
-+ Merb.push_path(:views, ChefServerSlice.root / "app" / "views", "**/*.rb")
-+
- Chef::Queue.connect
-
- # create the couch databases for openid association and nonce storage, if configured
Modified: trunk/chef/debian/patches/series
===================================================================
--- trunk/chef/debian/patches/series 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/patches/series 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,4 +1,3 @@
-chef_solr_ruby18.patch
+chef_server_load_path.patch
solr_load_path.patch
-remove_rubygems.patch
jquery_unminified.patch
Modified: trunk/chef/debian/patches/solr_load_path.patch
===================================================================
--- trunk/chef/debian/patches/solr_load_path.patch 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/patches/solr_load_path.patch 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,9 +1,9 @@
# Description: set the load path for chef-solr's binaries correctly for Debian
# FHS compliant location. No plans for upstream to change this.
-Index: chef-0.8.6/chef-solr/bin/chef-solr
+Index: chef-0.9.0/chef-solr/bin/chef-solr
===================================================================
---- chef-0.8.6.orig/chef-solr/bin/chef-solr 2010-03-06 22:45:32.000000000 -0700
-+++ chef-0.8.6/chef-solr/bin/chef-solr 2010-03-06 22:45:50.000000000 -0700
+--- chef-0.9.0.orig/chef-solr/bin/chef-solr 2010-06-28 17:51:19.000000000 -0600
++++ chef-0.9.0/chef-solr/bin/chef-solr 2010-06-28 17:51:21.000000000 -0600
@@ -19,8 +19,8 @@
$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
@@ -14,10 +14,10 @@
require 'chef/solr/application/solr'
Chef::Solr::Application::Solr.new.run
-Index: chef-0.8.6/chef-solr/bin/chef-solr-indexer
+Index: chef-0.9.0/chef-solr/bin/chef-solr-indexer
===================================================================
---- chef-0.8.6.orig/chef-solr/bin/chef-solr-indexer 2010-03-06 22:45:58.000000000 -0700
-+++ chef-0.8.6/chef-solr/bin/chef-solr-indexer 2010-03-06 22:46:04.000000000 -0700
+--- chef-0.9.0.orig/chef-solr/bin/chef-solr-indexer 2010-06-28 17:51:19.000000000 -0600
++++ chef-0.9.0/chef-solr/bin/chef-solr-indexer 2010-06-28 17:51:21.000000000 -0600
@@ -19,8 +19,8 @@
$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
@@ -28,10 +28,10 @@
require 'chef/solr/application/indexer'
Chef::Solr::Application::Indexer.new.run
-Index: chef-0.8.6/chef-solr/bin/chef-solr-rebuild
+Index: chef-0.9.0/chef-solr/bin/chef-solr-rebuild
===================================================================
---- chef-0.8.6.orig/chef-solr/bin/chef-solr-rebuild 2010-03-06 22:46:31.000000000 -0700
-+++ chef-0.8.6/chef-solr/bin/chef-solr-rebuild 2010-03-06 22:47:22.000000000 -0700
+--- chef-0.9.0.orig/chef-solr/bin/chef-solr-rebuild 2010-06-28 17:51:19.000000000 -0600
++++ chef-0.9.0/chef-solr/bin/chef-solr-rebuild 2010-06-28 17:51:21.000000000 -0600
@@ -19,8 +19,8 @@
$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
@@ -42,3 +42,19 @@
require 'chef/solr/application/rebuild'
Chef::Solr::Application::Rebuild.new.run
+Index: chef-0.9.0/chef-server-api/lib/chef-server-api.rb
+===================================================================
+--- chef-0.9.0.orig/chef-server-api/lib/chef-server-api.rb 2010-06-28 17:47:50.000000000 -0600
++++ chef-0.9.0/chef-server-api/lib/chef-server-api.rb 2010-06-28 17:51:21.000000000 -0600
+@@ -1,2 +1,3 @@
++$:.unshift File.join(File.dirname(__FILE__), "..", "..", "chef-solr", "lib")
+ CHEF_SERVER_VERSION = "0.8.11"
+ CHEF_SERVER_API_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
+Index: chef-0.9.0/chef-server-webui/lib/chef-server-webui.rb
+===================================================================
+--- chef-0.9.0.orig/chef-server-webui/lib/chef-server-webui.rb 2010-06-28 17:51:33.000000000 -0600
++++ chef-0.9.0/chef-server-webui/lib/chef-server-webui.rb 2010-06-28 17:52:01.000000000 -0600
+@@ -1,2 +1,3 @@
++$:.unshift File.join(File.dirname(__FILE__), "..", "..", "chef-solr", "lib")
+ CHEF_SERVER_WEBUI_VERSION = "0.8.11"
+ CHEF_SERVER_WEBUI_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
Added: trunk/chef/debian/po/cs.po
===================================================================
--- trunk/chef/debian/po/cs.po (rev 0)
+++ trunk/chef/debian/po/cs.po 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,93 @@
+# Czech translation of PO debconf template for package chef.
+# Copyright (C) 2010 Michal Simunek
+# This file is distributed under the same license as the chef package.
+# Michal Simunek <michal.simunek at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: chef 0.8.16-5\n"
+"Report-Msgid-Bugs-To: chef at packages.debian.org\n"
+"POT-Creation-Date: 2010-06-24 06:01+0200\n"
+"PO-Revision-Date: 2010-06-26 17:54+0200\n"
+"Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"
+"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid "Chef server URL:"
+msgstr "URL serveru Chef:"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid ""
+"Please specify the full URL that clients will use to connect to the Chef "
+"server (for instance \"http://chef.example.com:4000\")."
+msgstr ""
+"Zadejte prosím úplnou URL, kterou budou klienti používat ke spojení se "
+"serverem Chef (například \"http://chef.example.com:4000\")."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid "Password for the AMQP user \"chef\":"
+msgstr "Heslo pro AMQP uživatele \"chef\":"
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"Please choose a password for the default user (named \"chef\") in the AMQP "
+"server queue, under the default RabbitMQ vhost (also \"/chef\")."
+msgstr ""
+"Zadejte prosím heslo pro výchozího uživatele (zvaného \"chef\") ve frontě "
+"serveru AMQP, pod výchozím virtuálním hostitelem RabbitMQ (také \"/chef\")."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"RabbitMQ's rabbitmqctl program, which will be used to set this password, "
+"cannot read input from a file. Instead it will be passed as a command-line "
+"argument, so the password should not include any shell meta-characters that "
+"could cause errors, such as \"!\"."
+msgstr ""
+"RabbitMQ je program pro rabbitmqctl, který se použije k nastavení tohoto "
+"hesla, protože rabbitmqctl neumí přečíst informace ze souboru. Heslo se místo "
+"toho předá jako argument pro příkaz příkazové řádky, takže nesmí obsahovat meta "
+"znaky shellu, které by mohly způsobit chyby, jako je \"!\"."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid "Temporary password for the Chef server user \"admin\":"
+msgstr "Dočasné heslo pro uživatele Chef na serveru \"admin\":"
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"Please choose a temporary password for the first time the \"admin\" user "
+"logs into the Chef server web interface. It should be changed immediately "
+"after being used."
+msgstr ""
+"Zadejte prosím dočasné heslo pro první přihlášení uživatele \"admin\" do "
+"webového rozhraní serveru Chef. Po přihlášení by mělo být neprodleně "
+"změněno."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"This password must be at least six characters long. If no password is "
+"entered, a default value will be used which is displayed on the Chef server "
+"web interface home page."
+msgstr ""
+"Heslo by mělo být dlouhé alespoň šest znaků. Nebude-li zadáno žádné heslo, "
+"použije se výchozí hodnota, která se zobrazuje na domovské stránce webového "
+"rozhraní serveru Chef."
Added: trunk/chef/debian/po/da.po
===================================================================
--- trunk/chef/debian/po/da.po (rev 0)
+++ trunk/chef/debian/po/da.po 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,94 @@
+# Danish translation Chef.
+# Copyright (c) 2010 Chef & nedenstående oversættere.
+# This file is distributed under the same license as the Chef package.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: chef\n"
+"Report-Msgid-Bugs-To: chef at packages.debian.org\n"
+"POT-Creation-Date: 2010-06-24 06:01+0200\n"
+"PO-Revision-Date: 2010-06-28 17:34+0000\n"
+"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
+"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid "Chef server URL:"
+msgstr "Chefserver URL:"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid ""
+"Please specify the full URL that clients will use to connect to the Chef "
+"server (for instance \"http://chef.example.com:4000\")."
+msgstr ""
+"Angiv venligst den fulde URL som klienter vil bruge til at forbinde til "
+"Chefserveren (for eksempel »http://chef.eksempel.com:4000«)."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid "Password for the AMQP user \"chef\":"
+msgstr "Adgangskode for AMQP-brugeren »chef«:"
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"Please choose a password for the default user (named \"chef\") in the AMQP "
+"server queue, under the default RabbitMQ vhost (also \"/chef\")."
+msgstr ""
+"Vælg venligst en adgangskode for standardbrugeren (navngivet »chef«) i "
+"AMQP-serverkøen, under standarden RAbbitMQ vhost (også »/chef«)."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"RabbitMQ's rabbitmqctl program, which will be used to set this password, "
+"cannot read input from a file. Instead it will be passed as a command-line "
+"argument, so the password should not include any shell meta-characters that "
+"could cause errors, such as \"!\"."
+msgstr ""
+"RabbitMQs rabbitmqctl-program, som vil blive brugt til at angive adgangskoden, "
+"kan ikke læse inddata fra en fil. I steden for vil den blive sendt videre som et "
+"kommandolinjeargument, så adgangskoden skal ikke inkludere nogen "
+"skalmetategn som kan forårsage fejl, såsom »!«."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid "Temporary password for the Chef server user \"admin\":"
+msgstr "Midtertidig adgangskode for Chefserverbrugeren »admin«:"
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"Please choose a temporary password for the first time the \"admin\" user "
+"logs into the Chef server web interface. It should be changed immediately "
+"after being used."
+msgstr ""
+"Vælg venligst en midlertidig adgangskode for første gang »adminbrugeren« "
+"logger på Chefserverens internetgrænseflade. Den skal ændres umiddelbart "
+"efter brug."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"This password must be at least six characters long. If no password is "
+"entered, a default value will be used which is displayed on the Chef server "
+"web interface home page."
+msgstr ""
+"Denne adgangskode skal være mindst seks tegn lang. Hvis ingen "
+"adgangskode indtastes, vil en standardværdi blive brugt som vises på "
+"hjemmesiden for Chefserverens internetgrænseflade."
+
+
Added: trunk/chef/debian/po/fr.po
===================================================================
--- trunk/chef/debian/po/fr.po (rev 0)
+++ trunk/chef/debian/po/fr.po 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,97 @@
+# Translation of chef debconf templates to French
+# Copyright (C) 2010 Debian French l10n team <debian-l10n-french at lists.debian.org
+# This file is distributed under the same license as the chef package.
+#
+# David Prévot <david at tilapin.org>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: chef 0.8.16-4\n"
+"Report-Msgid-Bugs-To: chef at packages.debian.org\n"
+"POT-Creation-Date: 2010-06-24 10:09-0400\n"
+"PO-Revision-Date: 2010-06-17 09:52-0400\n"
+"Last-Translator: David Prévot <david at tilapin.org>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid "Chef server URL:"
+msgstr "URL du serveur Chef :"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid ""
+"Please specify the full URL that clients will use to connect to the Chef "
+"server (for instance \"http://chef.example.com:4000\")."
+msgstr ""
+"Veuillez indiquer l'URL complète que les clients utiliseront pour se "
+"connecter au serveur Chef (par exemple « http://chef.example.com:4000 »)"
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid "Password for the AMQP user \"chef\":"
+msgstr "Mot de passe pour l'identifiant AMQP « chef » :"
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"Please choose a password for the default user (named \"chef\") in the AMQP "
+"server queue, under the default RabbitMQ vhost (also \"/chef\")."
+msgstr ""
+"Veuillez choisir un mot de passe pour l'identifiant par défaut (appelé "
+"« chef ») dans la file du serveur AMQP, pour l'hôte virtuel RabbitMQ par "
+"défaut (appelé « /chef » lui aussi) :"
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"RabbitMQ's rabbitmqctl program, which will be used to set this password, "
+"cannot read input from a file. Instead it will be passed as a command-line "
+"argument, so the password should not include any shell meta-characters that "
+"could cause errors, such as \"!\"."
+msgstr ""
+"Le programme rabbitmqctl de RabbitMQ, qui sera utilisé pour configurer ce "
+"mot de passe, ne peut pas le lire depuis un fichier. À la place, il sera "
+"passé comme un paramètre de ligne de commande, donc le mot de passe ne doit "
+"pas comporter de métacaractère qui risque de provoquer des erreurs, comme "
+"« ! »."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid "Temporary password for the Chef server user \"admin\":"
+msgstr "Mot de passe temporaire pour l'identifiant « admin » du serveur Chef :"
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"Please choose a temporary password for the first time the \"admin\" user "
+"logs into the Chef server web interface. It should be changed immediately "
+"after being used."
+msgstr ""
+"Veuillez choisir un mot de passe temporaire pour la première connexion avec "
+"l'identifiant « admin » à l'interface web du serveur Chef. Il devrait être "
+"changé immédiatement après avoir été utilisé."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"This password must be at least six characters long. If no password is "
+"entered, a default value will be used which is displayed on the Chef server "
+"web interface home page."
+msgstr ""
+"Ce mot de passe doit contenir au moins six caractères. Si aucun mot de passe "
+"n'est choisi, le mot de passe par défaut affiché sur la page d'accueil de "
+"l'interface web du serveur Chef sera utilisé."
Added: trunk/chef/debian/po/pt.po
===================================================================
--- trunk/chef/debian/po/pt.po (rev 0)
+++ trunk/chef/debian/po/pt.po 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,95 @@
+# Portuguese translation for chef's debconf messages
+# Copyright (C) 2010 THE CHEF'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the chef package.
+# Rui Branco <ruipb at debianpt.org>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: chef 0.8.16-5\n"
+"Report-Msgid-Bugs-To: chef at packages.debian.org\n"
+"POT-Creation-Date: 2010-06-24 06:01+0200\n"
+"PO-Revision-Date: 2010-06-26 13:14+0100\n"
+"Last-Translator: Rui Branco <ruipb at debianpt.org>\n"
+"Language-Team: Portuguese <traduz at debianpt.org>\n"
+"Language: Portuguese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid "Chef server URL:"
+msgstr "URL do servidor chef:"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid ""
+"Please specify the full URL that clients will use to connect to the Chef "
+"server (for instance \"http://chef.example.com:4000\")."
+msgstr ""
+"Por favor especifique o URL completo que os clientes utilizarão para "
+"contactar o servidor Chef (por exemplo \"http://chef.example.com:4000\")."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid "Password for the AMQP user \"chef\":"
+msgstr "Palavra-chave para o utilizador AMQP \"chef\":"
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"Please choose a password for the default user (named \"chef\") in the AMQP "
+"server queue, under the default RabbitMQ vhost (also \"/chef\")."
+msgstr ""
+"Por favor defina a palavra-chave para o utilizador predefinido (chamado "
+"\"chef\") na lista do servidor AMQP, contido por predefinição no vhost "
+"RabbitMQ (também \"/chef\")."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"RabbitMQ's rabbitmqctl program, which will be used to set this password, "
+"cannot read input from a file. Instead it will be passed as a command-line "
+"argument, so the password should not include any shell meta-characters that "
+"could cause errors, such as \"!\"."
+msgstr ""
+"O programa rabbitmqctl do RabbitMQ's que será utilizado para definir esta "
+"palavra-chave, não pode receber o input de um ficheiro. Em vez disso esta "
+"será passada como um argumento em linha de comando, desta forma a palavra-"
+"chave não deverá incluir nenhuns meta-caracteres de consola que possam "
+"causar erros, tais como \"!\"."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid "Temporary password for the Chef server user \"admin\":"
+msgstr "Palavra-chave temporária para o utilizador \"admin\" do servidor Chef:"
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"Please choose a temporary password for the first time the \"admin\" user "
+"logs into the Chef server web interface. It should be changed immediately "
+"after being used."
+msgstr ""
+"Por favor defina uma palavra-chave temporária para a primeira vez que o "
+"utilizador \"admin\" entra na interface web do servidor Chef. Deverá ser "
+"alterada imediatamente após ser utilizada."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"This password must be at least six characters long. If no password is "
+"entered, a default value will be used which is displayed on the Chef server "
+"web interface home page."
+msgstr ""
+"Esta palavra-chave deverá conter pelo menos seis caracteres. Se nenhuma "
+"palavra-chave for definida será usado um valor predefinido, o mesmo será "
+"visualizado na interface web da página principal do servidor web."
Added: trunk/chef/debian/po/ru.po
===================================================================
--- trunk/chef/debian/po/ru.po (rev 0)
+++ trunk/chef/debian/po/ru.po 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,95 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <yuray at komyakino.ru>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: chef 0.8.16-5\n"
+"Report-Msgid-Bugs-To: chef at packages.debian.org\n"
+"POT-Creation-Date: 2010-06-24 06:01+0200\n"
+"PO-Revision-Date: 2010-06-24 19:18+0400\n"
+"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid "Chef server URL:"
+msgstr "URL сервера Chef:"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid ""
+"Please specify the full URL that clients will use to connect to the Chef "
+"server (for instance \"http://chef.example.com:4000\")."
+msgstr ""
+"Введите полный URL, по которому клиенты будут подключаться "
+"к серверу Chef (например, \"http://chef.example.com:4000\")."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid "Password for the AMQP user \"chef\":"
+msgstr "Пароль пользователя с именем \"chef\" для AMQP:"
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"Please choose a password for the default user (named \"chef\") in the AMQP "
+"server queue, under the default RabbitMQ vhost (also \"/chef\")."
+msgstr ""
+"Введите пароль для пользователя по умолчанию (с именем \"chef\") к "
+"очереди сервера AMQP на RabbitMQ vhost по умолчанию (тоже \"/chef\")."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid ""
+"RabbitMQ's rabbitmqctl program, which will be used to set this password, "
+"cannot read input from a file. Instead it will be passed as a command-line "
+"argument, so the password should not include any shell meta-characters that "
+"could cause errors, such as \"!\"."
+msgstr ""
+"Программа rabbitmqctl от RabbitMQ, которая будет использована для установки пароля, "
+"не умеет читать данные из файла. Вместо этого пароль будет передаваться ей "
+"как параметр командной строки, поэтому он не должен содержать метасимволов "
+"командного интерпретатора (например \"!\"), так как это приведёт к ошибкам."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid "Temporary password for the Chef server user \"admin\":"
+msgstr "Временный пароль на сервер Chef для пользователя \"admin\":"
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"Please choose a temporary password for the first time the \"admin\" user "
+"logs into the Chef server web interface. It should be changed immediately "
+"after being used."
+msgstr ""
+"Введите временный пароль для первого входа в "
+"веб-интерфейс сервера Chef под пользователем \"admin\". "
+"Он должен быть сразу изменён после использования."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid ""
+"This password must be at least six characters long. If no password is "
+"entered, a default value will be used which is displayed on the Chef server "
+"web interface home page."
+msgstr ""
+"Этот пароль должен быть не менее шести символов. Если пароль "
+"не введён, то используемое значение по умолчанию будет показано "
+"на домашней странице веб-интерфейса сервера Chef."
Added: trunk/chef/debian/po/sv.po
===================================================================
--- trunk/chef/debian/po/sv.po (rev 0)
+++ trunk/chef/debian/po/sv.po 2010-07-06 19:45:38 UTC (rev 5670)
@@ -0,0 +1,142 @@
+# Translation of chef debconf template to Swedish
+# Copyright (C) 2010 Martin Bagge <brother at bsnet.se>
+# This file is distributed under the same license as the chef package.
+#
+# Martin Bagge <brother at bsnet.se>, 2010
+msgid ""
+msgstr ""
+"Project-Id-Version: chef\n"
+"Report-Msgid-Bugs-To: chef at packages.debian.org\n"
+"POT-Creation-Date: 2010-06-24 06:01+0200\n"
+"PO-Revision-Date: 2010-06-24 13:02+0100\n"
+"Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid "Chef server URL:"
+msgstr "Chef-server-URL:"
+
+#. Type: string
+#. Description
+#: ../chef.templates:2001
+msgid "Please specify the full URL that clients will use to connect to the Chef server (for instance \"http://chef.example.com:4000\")."
+msgstr "Ange komplett URL som klienter ska använda för att anvsluta till Chef-servern (ex. \"http://chef.example.com:4000\")."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+#| msgid ""
+#| "New password for the 'chef' AMQP user in the RabbitMQ vhost \"/chef\":"
+msgid "Password for the AMQP user \"chef\":"
+msgstr "Lösenord för AMPQ-användaren \"chef\":"
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+#| msgid ""
+#| "New password for the 'chef' AMQP user in the RabbitMQ vhost \"/chef\":"
+msgid "Please choose a password for the default user (named \"chef\") in the AMQP server queue, under the default RabbitMQ vhost (also \"/chef\")."
+msgstr "Ange lösenord för standardanvändaren (\"chef\") i AMQP-serverns standard RabbitMQ-vhost (kallas för \"/chef\")."
+
+#. Type: password
+#. Description
+#: ../chef-solr.templates:2001
+msgid "RabbitMQ's rabbitmqctl program, which will be used to set this password, cannot read input from a file. Instead it will be passed as a command-line argument, so the password should not include any shell meta-characters that could cause errors, such as \"!\"."
+msgstr "Programmet rabbitmqctl som används för att applicera lösenirdet kan inte läsa från en fil. Istället skickas det som ett argument på kommandoraden, därför ska lösenordet inte innehålla specialtecken som kan orsaka fel i skalet (ex. \"!\")."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid "Temporary password for the Chef server user \"admin\":"
+msgstr "Temporärt lösenord för Chef-server-användaren \"admin\"."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid "Please choose a temporary password for the first time the \"admin\" user logs into the Chef server web interface. It should be changed immediately after being used."
+msgstr "Ange ett temporärt lösenord som används första gången användaren \"admin\" loggar in i webbgränssnittet för Chef-servern. Det ska bytas ut omedelbart efter att det har använts."
+
+#. Type: password
+#. Description
+#: ../chef-server-webui.templates:2001
+msgid "This password must be at least six characters long. If no password is entered, a default value will be used which is displayed on the Chef server web interface home page."
+msgstr "Lösenordet måste vara minst sex tecken långt. Om inget lösenord ange kommer standardvärde att användas och detta visas på startsidan för Chef-serverns webbgränssnitt."
+
+#~ msgid ""
+#~ " Set the password for the chef user in the AMQP server queue. Use\n"
+#~ " RabbitMQ's rabbitmqctl program to set this password. The default user\n"
+#~ " and vhost are assumed (chef and /chef, respectively).\n"
+#~ " .\n"
+#~ " RabbitMQ does not have the capability to read the password from a file, "
+#~ "and\n"
+#~ " this will be passed via \"\" on the command-line. As such, do not use "
+#~ "shell\n"
+#~ " meta-characters that could cause errors such as !.\n"
+#~ " .\n"
+#~ " This will be used in /etc/chef/solr.rb and /etc/chef/server.rb as "
+#~ "'amqp_pass'."
+#~ msgstr ""
+#~ " Ange lösenordet för chef-användaren i AMQP-serverns kö. Använd\n"
+#~ " RabbitMQs program rabbitmqctl för att sätta lösenordet. Standard-\n"
+#~ " användaren och vhost kommer att användas (chef respektive /chef).\n"
+#~ " .\n"
+#~ " RabbitMQ har inte möjlighet att läsa lösenord från en fil och "
+#~ "lösenordet\n"
+#~ " kommer att skickas via \"\" på kommandoraden. Därför kan inte special-\n"
+#~ " tecken i skalet användas i lösenordet, exempelvis !.\n"
+#~ " .\n"
+#~ " Detta kommer att användas i /etc/chef/solr.rb och /etc/chef/server.rb "
+#~ "som\n"
+#~ " \"amqp_pass\"."
+#~ msgid "New password for the 'admin' user in the Chef Server WebUI:"
+#~ msgstr ""
+#~ "Nytt lösenord för administrationsanvändaren i Chef-serverns webbaserade "
+#~ "gränssnitt:"
+#~ msgid ""
+#~ " This sets a temporary first-use password to log into the Chef Server "
+#~ "WebUI\n"
+#~ " as the 'admin' user for the first time. Once logged in, the password "
+#~ "should\n"
+#~ " be changed immediately.\n"
+#~ " .\n"
+#~ " Once the chef-server-webui process is running, login using the username\n"
+#~ " 'admin' using the password set here.\n"
+#~ " .\n"
+#~ " If a password is not entered, the webui default password for 'admin' "
+#~ "will\n"
+#~ " be used, which is displayed on the webui home page. The password must "
+#~ "be\n"
+#~ " at least 6 characters or the webui will not start properly.\n"
+#~ " .\n"
+#~ " This will be used in /etc/chef/webui.rb as "
+#~ "'web_ui_admin_default_password'.\n"
+#~ " ."
+#~ msgstr ""
+#~ " Här kommer ett första, temporärt, lösenord för att logga in i Chef-"
+#~ "serverns\n"
+#~ " webbaserade gränssnitt att installeras. Lösenordet används bara första\n"
+#~ " gången \"admin\" loggar in. Väl inloggad bör lösenordet bytas "
+#~ "omedelbart.\n"
+#~ " .\n"
+#~ " När väl processen för chef-server-webui körs kan inloggning med "
+#~ "användar-\n"
+#~ " namnet \"admin\" och lösenordet som anges här genomföras.\n"
+#~ " .\n"
+#~ " Om ett lösenord inte anges kommer standardlösenordet för det "
+#~ "webbaserade\n"
+#~ " gränssnittet att användas och detta visas på hemsidan för gränssnittet.\n"
+#~ " Lösenordet måste vara minst sex tecken långt annars kommer inte\n"
+#~ " webbgränssnittet att kunna visas.\n"
+#~ " .\n"
+#~ " Detta kommer att användas i /etc/chef/webui.rb som "
+#~ "\"web_ui_admin_default_password\".\n"
+#~ " ."
+
Modified: trunk/chef/debian/rules
===================================================================
--- trunk/chef/debian/rules 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/rules 2010-07-06 19:45:38 UTC (rev 5670)
@@ -63,30 +63,25 @@
dh_installinit --name=chef-solr-indexer -- defaults 85 02
dh_installlogrotate --name=chef-solr-indexer
-install/chef-server::
- mkdir -p $(CURDIR)/debian/chef-server/usr/bin
- cp debian/etc/chef/server.rb debian/chef-server/usr/share/chef-server
- cp chef-server/bin/chef-server debian/chef-server/usr/bin
- cp chef-server/README.rdoc debian/chef-server/usr/share/doc/chef-server
- cp chef-server/config.ru debian/chef-server/usr/share/chef-server
- cp -rf chef-server/app debian/chef-server/usr/share/chef-server
- cp -rf chef-server/config debian/chef-server/usr/share/chef-server
- cp -rf chef-server/lib debian/chef-server/usr/share/chef-server
- cp -rf chef-server/public debian/chef-server/usr/share/chef-server
- dh_installinit --name=chef-server -- defaults 90 02
-
install/chef-server-api::
+ mkdir -p $(CURDIR)/debian/chef-server-api/usr/sbin
+ mkdir -p $(CURDIR)/debian/chef-server-api/usr/share/chef-server-api
+ mkdir -p $(CURDIR)/debian/chef-server-api/usr/share/doc/chef-server-api
+ cp debian/etc/chef/server.rb debian/chef-server-api/usr/share/chef-server-api
+ cp chef-server-api/bin/chef-server debian/chef-server-api/usr/sbin
cp chef-server-api/README.rdoc debian/chef-server-api/usr/share/doc/chef-server-api
cp -rf chef-server-api/app debian/chef-server-api/usr/share/chef-server-api
cp -rf chef-server-api/config debian/chef-server-api/usr/share/chef-server-api
cp -rf chef-server-api/public debian/chef-server-api/usr/share/chef-server-api
cp -rf chef-server-api/lib debian/chef-server-api/usr/share/chef-server-api
find debian/chef-server-api -type f -perm +755 -exec chmod 644 {} \;
+ dh_installinit --name=chef-server -- defaults 90 02
install/chef-server-webui::
+ mkdir -p $(CURDIR)/debian/chef-server-webui/usr/sbin
cp debian/etc/chef/webui.rb debian/chef-server-webui/usr/share/chef-server-webui
- cp chef-server/bin/chef-server-webui debian/chef-server/usr/bin
- cp chef-server/config-webui.ru debian/chef-server/usr/share/chef-server
+ cp chef-server-webui/bin/chef-server-webui debian/chef-server-webui/usr/sbin
+ cp chef-server-webui/config.ru debian/chef-server-webui/usr/share/chef-server-webui
cp chef-server-webui/README.rdoc debian/chef-server-webui/usr/share/doc/chef-server-webui
cp -rf chef-server-webui/app debian/chef-server-webui/usr/share/chef-server-webui
cp -rf chef-server-webui/config debian/chef-server-webui/usr/share/chef-server-webui
Modified: trunk/chef/debian/watch
===================================================================
--- trunk/chef/debian/watch 2010-07-06 10:10:41 UTC (rev 5669)
+++ trunk/chef/debian/watch 2010-07-06 19:45:38 UTC (rev 5670)
@@ -1,2 +1,3 @@
version=3
-http://githubredir.debian.net/github/opscode/chef /([0..9].*).tar.gz debian debian/repack.sh
+opts=dversionmangle=s/\+dfsg// \
+ http://githubredir.debian.net/github/opscode/chef /([0..9].*).tar.gz debian debian/repack.sh
More information about the Pkg-ruby-extras-commits
mailing list