Merge branch '0.9.4'

README.rst

@@ -4,7 +4,7 @@ What is Salt?
 
 .. rubric:: We’re not just talking about NaCl.
 
-Distributed remote execution
+Distributed Remote Execution
 ============================
 
 Salt is a distributed remote execution system used to execute commands and
@@ -26,7 +26,7 @@ server/client model with the needed functionality built into a single set of
 daemons. While the default configuration will work with little to no
 modification, Salt can be fine tuned to meet specific needs.
 
-Parallel execution
+Parallel Execution
 ==================
 
 The core function of Salt is to enable remote commands to be called in parallel
@@ -36,7 +36,7 @@ also introduces more granular controls to the realm of remote execution,
 allowing for commands to be executed in parallel and for systems to be targeted
 based on more than just hostname, but by system properties.
 
-Building on proven technology
+Building on Proven Technology
 =============================
 
 Salt takes advantage of a number of technologies and techniques. The networking
@@ -49,7 +49,7 @@ Python pickles, enabling fast and light network traffic.
 
 .. _`ZeroMQ`: http://www.zeromq.org/
 
-Python client interface
+Python Client Interface
 =======================
 
 In order to allow for simple expansion, Salt execution routines can be written
@@ -59,8 +59,8 @@ a simple Python API, or from the command line, so that Salt can be used to
 execute one-off commands as well as operate as an integral part of a larger
 application.
 
-Fast, flexible, scalable, pretty, secure
-========================================
+Fast, Flexible, Scalable, Secure
+================================
 
 The result is a system that can execute commands across groups of
 varying size, from very few to very many servers at considerably high

conf/master

@@ -50,6 +50,10 @@
 #
 # The renderer to use on the minions to render the state data
 #renderer: yaml_jinja
+#
+# The failhard option tells the minions to stop immediately after the first
+# failure detected in the state execution, defaults to False
+#failhard: False
 
 #####      File Server settings      #####
 ##########################################

debian/changelog

@@ -1,3 +1,27 @@
+salt (0.9.4-1) lucid; urgency=low
+
+  * Build PPA for 0.9.4
+
+ -- Seth House <seth@eseth.com>  Sun, 27 Nov 2011 16:11:36 -0700
+
+salt (0.9.4.pre-d353743-1) lucid; urgency=low
+
+  * Build PPA for Ubuntu (fixed?)
+
+ -- Seth House <seth@eseth.com>  Wed, 25 Nov 2011 23:19:00 -0600
+
+salt (0.9.4.pre-6dd76f2-1) lucid; urgency=low
+
+  * Build PPA for Ubuntu (fixed?)
+
+ -- Seth House <seth@eseth.com>  Wed, 25 Nov 2011 11:19:00 -0600
+
+salt (0.9.4.pre-1) lucid; urgency=low
+
+  * Build PPA for Ubuntu
+
+ -- Seth House <seth@eseth.com>  Wed, 25 Nov 2011 11:19:00 -0600
+
 salt (0.9.2-2) unstable; urgency=low
 
   * Fixed many lintian(1) warnings and errors

debian/compat

@@ -1 +1 @@
-8
+7

debian/control

@@ -2,18 +2,20 @@ Source: salt
 Section: admin
 Priority: optional
 Maintainer: Aaron Toponce <aaron.toponce@gmail.com>
-Build-Depends: debhelper (>= 8.0.0), python-support,
- cython
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7), python-support, cython, python-yaml,
+ python-setuptools, python-yaml, python-crypto, python-m2crypto,
+ python-pyzmq (>= 2.1.9), libzmq1 (>= 2.1.9), libzmq-dev (>= 2.1.9),
+ python (>= 2.6), python-jinja2
+Standards-Version: 3.8.3
 Homepage: http://saltstack.org
 #Vcs-Git: git://git.debian.org/collab-maint/salt.git
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/salt.git;a=summary
 
 Package: salt
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-setuptools,
- python-yaml, python-crypto, python-m2crypto, python-zmq, libzmq1,
- libzmq-dev, python (>= 2.6)
+ python-yaml, python-crypto, python-m2crypto, python-pyzmq (>= 2.1.9),
+ libzmq1 (>= 2.1.9), libzmq-dev (>= 2.1.9), python (>= 2.6), python-jinja2
 Description: This package provides a remote manager to administer servers.
  This package is a powerful remote execution manager that can be used to
  administer servers in a fast and efficient way.

debian/files

@@ -1 +1 @@
-salt_0.9.2-2_all.deb admin optional
+salt_0.9.4-1_all.deb admin optional

debian/patches/no-license

@@ -1,7 +1,7 @@
-Index: salt-0.9.2/setup.py
+Index: salt-0.9.4/setup.py
 ===================================================================
---- salt-0.9.2.orig/setup.py	2011-10-03 21:07:32.524520895 -0600
-+++ salt-0.9.2/setup.py	2011-10-03 21:14:33.852854281 -0600
+--- salt-0.9.4.orig/setup.py	2011-10-03 21:07:32.524520895 -0600
++++ salt-0.9.4/setup.py	2011-10-03 21:14:33.852854281 -0600
 @@ -92,7 +92,7 @@
                      ['salt/modules/cytest.pyx',
                      ]),

debian/salt.salt-master.init

@@ -40,15 +40,23 @@ SERVICE=salt-master
 PROCESS=salt-master
 CONFIG_ARGS=" "
 
+PS_CMD="ps -e -o pid,args"
+PROC_LIST=""
+
 RETVAL=0
 
+findproc() {
+    PROC_LIST=`$PS_CMD | grep $PROCESS | grep -v grep | grep -v sh | grep -v vi | awk '{ print $1 }'`
+}
+
 start() {
     echo -n $"Starting salt-master daemon: "
     if [ -f $SUSE_RELEASE ]; then
         startproc -f -p /var/run/$SERVICE.pid /usr/bin/salt-master -d $CONFIG_ARGS
         rc_status -v
     elif [ -e $DEBIAN_VERSION ]; then
-        if [ -f $LOCKFILE ]; then
+        findproc
+        if [ -n "$PROC_LIST" ]; then
             echo -n "already started, lock file found" 
             RETVAL=1
         elif /usr/bin/python /usr/bin/salt-master -d; then
@@ -70,7 +78,8 @@ stop() {
         rc_status -v
     elif [ -f $DEBIAN_VERSION ]; then
         # Added this since Debian's start-stop-daemon doesn't support spawned processes
-        if ps -ef | grep "/usr/bin/python /usr/bin/salt-master" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
+        findproc
+        if echo $PROC_LIST | xargs kill >/dev/null 2>&1 ; then
             echo -n "OK"
             RETVAL=0
         else
@@ -100,7 +109,8 @@ case "$1" in
             checkproc /usr/bin/salt-master
             rc_status -v
         elif [ -f $DEBIAN_VERSION ]; then
-            if [ -f $LOCKFILE ]; then
+            findproc
+            if [ -n "$PROC_LIST" ]; then
                 RETVAL=0
                 echo "salt-master is running."
             else
@@ -113,7 +123,8 @@ case "$1" in
         fi
         ;;
     condrestart)
-        [ -f $LOCKFILE ] && restart || :
+        findproc
+        [ -n "$PROC_LIST" ] && restart || :
         ;;
     reload|force-reload)
         echo "Can't reload configuration, you have to restart it"

debian/salt.salt-minion.init

@@ -40,15 +40,23 @@ SERVICE=salt-minion
 PROCESS=salt-minion
 CONFIG_ARGS=" "
 
+PS_CMD="ps -e -o pid,args"
+PROC_LIST=""
+
 RETVAL=0
 
+findproc() {
+    PROC_LIST=`$PS_CMD | grep $PROCESS | grep -v grep | grep -v sh | grep -v vi | awk '{ print $1 }'`
+}
+
 start() {
     echo -n $"Starting salt-minion daemon: "
     if [ -f $SUSE_RELEASE ]; then
         startproc -f -p /var/run/$SERVICE.pid /usr/bin/salt-minion -d $CONFIG_ARGS
         rc_status -v
     elif [ -e $DEBIAN_VERSION ]; then
-        if [ -f $LOCKFILE ]; then
+        findproc
+        if [ -n "$PROC_LIST" ]; then
             echo -n "already started, lock file found" 
             RETVAL=1
         elif /usr/bin/python /usr/bin/salt-minion -d; then
@@ -70,7 +78,8 @@ stop() {
         rc_status -v
     elif [ -f $DEBIAN_VERSION ]; then
         # Added this since Debian's start-stop-daemon doesn't support spawned processes
-        if ps -ef | grep "/usr/bin/python /usr/bin/salt-minion" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
+        findproc
+        if echo $PROC_LIST | xargs kill >/dev/null 2>&1 ; then
             echo -n "OK"
             RETVAL=0
         else
@@ -100,7 +109,8 @@ case "$1" in
             checkproc /usr/bin/salt-minion
             rc_status -v
         elif [ -f $DEBIAN_VERSION ]; then
-            if [ -f $LOCKFILE ]; then
+            findproc
+            if [ -n "$PROC_LIST" ]; then
                 RETVAL=0
                 echo "salt-minion is running."
             else
@@ -113,7 +123,8 @@ case "$1" in
         fi
         ;;
     condrestart)
-        [ -f $LOCKFILE ] && restart || :
+        findproc
+        [ -n "$PROC_LIST" ] && restart || :
         ;;
     reload|force-reload)
         echo "Can't reload configuration, you have to restart it"

debian/salt.salt-syndic.init

@@ -40,15 +40,23 @@ SERVICE=salt-syndic
 PROCESS=salt-syndic
 CONFIG_ARGS=" "
 
+PS_CMD="ps -e -o pid,args"
+PROC_LIST=""
+
 RETVAL=0
 
+findproc() {
+    PROC_LIST=`$PS_CMD | grep $PROCESS | grep -v grep | grep -v sh | grep -v vi | awk '{ print $1 }'`
+}
+
 start() {
     echo -n $"Starting salt-syndic daemon: "
     if [ -f $SUSE_RELEASE ]; then
         startproc -f -p /var/run/$SERVICE.pid /usr/bin/salt-syndic -d $CONFIG_ARGS
         rc_status -v
     elif [ -e $DEBIAN_VERSION ]; then
-        if [ -f $LOCKFILE ]; then
+        findproc
+        if [ -n "$PROC_LIST" ]; then
             echo -n "already started, lock file found" 
             RETVAL=1
         elif /usr/bin/python /usr/bin/salt-syndic -d; then
@@ -70,7 +78,8 @@ stop() {
         rc_status -v
     elif [ -f $DEBIAN_VERSION ]; then
         # Added this since Debian's start-stop-daemon doesn't support spawned processes
-        if ps -ef | grep "/usr/bin/python /usr/bin/salt-syndic" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
+        findproc
+        if echo $PROC_LIST | xargs kill >/dev/null 2>&1 ; then
             echo -n "OK"
             RETVAL=0
         else
@@ -100,7 +109,8 @@ case "$1" in
             checkproc /usr/bin/salt-syndic
             rc_status -v
         elif [ -f $DEBIAN_VERSION ]; then
-            if [ -f $LOCKFILE ]; then
+            findproc
+            if [ -n "$PROC_LIST" ]; then
                 RETVAL=0
                 echo "salt-syndic is running."
             else

doc/_templates/404.html

@@ -0,0 +1,17 @@
+{% extends "layout.html" %}
+{% set title = 'Page not found' %}
+
+{% block body %}
+<h1>404: Page not found</h1>
+
+<p>The page you are requesting cannot be found. Please try one of the following
+pages instead:</p>
+
+<ul>
+    <li><a href="{{ pathto("index") }}">Home page</a></li>
+    <li><a href="{{ pathto("topics/community") }}">Community</a></li>
+    <li><a href="{{ pathto("search") }}">Search</a></li>
+    <li><a href="{{ pathto("py-modindex") }}">Salt module index</a></li>
+    <li><a href="{{ pathto("home") }}">Salt Documentation</a></li>
+</ul>
+{% endblock %}

doc/conf.py

@@ -60,7 +60,10 @@
 html_style = ['base-salt.css']
 html_use_smartypants = False
 
-html_additional_pages = {'index': 'index.html'}
+html_additional_pages = {
+    'index': 'index.html',
+    '404': '404.html',
+}
 
 html_default_sidebars = [
     'localtoc.html',