Merge branch 'develop' of git://github.com/saltstack/salt into develop

.gitignore

@@ -1,6 +1,8 @@
 build
 *.py[co]
 pkg/arch/*.tar.xz
+*.swp
+doc/_build
 
 # virtualenv
 # - ignores directories of a virtualenv when you create it right on

AUTHORS

@@ -27,4 +27,6 @@ Joseph P. Hall
 
 Erik Nolte
 
+Jeff Schroeder aka SEJeff
+
 Matthias Teege

conf/master

@@ -33,12 +33,12 @@
 ##########################################
 # Enable "open mode", this mode still maintains encryption, but turns off
 # authentication, this is only intended for highly secure environments or for
-# the situation where your keys end up in a bad state. If you run in open more
+# the situation where your keys end up in a bad state. If you run in open mode
 # you do so at your own risk!
 #open_mode: False
 
 # Enable auto_accept, this setting will automatically accept all incoming
-# public keys from the minions
+# public keys from the minions. Note that this is insecure.
 #auto_accept: False
 
 #####      State System settings     #####
@@ -168,3 +168,15 @@
 #   }
 #
 #log_granular_levels: {}
+
+
+#####         Node Groups           #####
+##########################################
+# Node groups allow for logical groupings of minion nodes.
+# A group consists of a group name and a compound target.
+# 
+# nodegroups: {
+#   group1: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com',
+#   group2: 'G@os:Debian and foo.domain.com',
+# }
+

conf/minion

@@ -59,8 +59,11 @@
 #
 #renderer: yaml_jinja
 #
-# Test allows for the state runs to only be test runs
-#test: False
+# state_verbose allows for the data returned from the minion to be more
+# verbose. Normaly only states that fail or states that have changes are
+# returned, but setting state_verbose to True will return all states that
+# were checked
+#state_verbose: False
 
 ######        Security settings       #####
 ###########################################
@@ -97,6 +100,14 @@
 #log_granular_levels: {}
 
 
+######  Miscellaneous configuration   #####
+###########################################
+# When waiting for a master to accept the minion's public key, salt will
+# contiuously attempt to reconnect until successful. This is the time, in
+# seconds, between those reconnection attempts.
+# acceptance_wait_time = 10
+
+
 ######      Module configuration      #####
 ###########################################
 # Salt allows for modules to be passed arbitrary configuration data, any data

debian/changelog

@@ -1,36 +1,6 @@
-salt (0.9.4-1) lucid; urgency=low
+salt (0.9.5+git20111227.g8182e48-1) unstable; urgency=low
 
-  * Build PPA for 0.9.4
+  * First package release. (Closes: #643789)
 
- -- Seth House <seth@eseth.com>  Sun, 27 Nov 2011 16:11:36 -0700
+ -- Corey Quinn <corey@sequestered.net>  Mon, 26 Dec 2011 13:55:22 -0800
 
-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
-
- -- Aaron Toponce <aaron.toponce@gmail.com>  Mon, 03 Oct 2011 21:34:25 -0600
-
-salt (0.9.2-1) unstable; urgency=low
-
-  * Initial release. (Closes: #643789)
-  * First Debian package
-
- -- Aaron Toponce <aaron.toponce@gmail.com>  Wed, 28 Sep 2011 01:21:48 -0600

debian/control

@@ -1,24 +1,81 @@
 Source: salt
 Section: admin
 Priority: optional
-Maintainer: Aaron Toponce <aaron.toponce@gmail.com>
-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
+Maintainer: Corey Quinn <corey@sequestered.net>
+Build-Depends: debhelper (>= 7.0.50~),
+               python-support,
+               cython,
+               python-yaml,
+               python-setuptools,
+               python-yaml,
+               python-crypto,
+               python-m2crypto,
+               python-zmq (>= 2.1.9),
+               libzmq1 (>= 2.1.9),
+               libzmq-dev (>= 2.1.9),
+               python (>= 2.6),
+               python-dev (>= 2.6),
+               python-jinja2
+Standards-Version: 3.9.2
 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
+
+Package: salt-common
+Architecture: any
+Depends:    ${python:Depends},
+            ${misc:Depends}
+Description: Shared libraries that salt requires for all packages
+ This package is a powerful remote execution manager that can be used
+ to administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of servers. This
+ means systems can be easily managed, but data can also be easily gathered.
+ Quick introspection into running systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a remote
+ system. Salt addresses this problem as well, the salt state system uses
+ salt state files to define the state a server needs to be in.
+ .
+ Between the remote execution system, and state management Salt addresses
+ the backbone of cloud and data center management.
+ .
+ This particular package provides shared libraries that salt-master, salt-minion,
+ and salt-syndic require to function.
+
+
+Package: salt-master
+Architecture: all
+Depends:    ${python:Depends},
+            ${misc:Depends},
+            salt-common
+Description: This package provides a remote manager to administer servers via salt
+ This package is a powerful remote execution manager that can be used
+ to administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of servers. This
+ means systems can be easily managed, but data can also be easily gathered.
+ Quick introspection into running systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a remote
+ system. Salt addresses this problem as well, the salt state system uses
+ salt state files to define the state a server needs to be in.
+ .
+ Between the remote execution system, and state management Salt addresses
+ the backbone of cloud and data center management.
+ .
+ This particular package provides the salt controller.
+
+
+Package: salt-minion
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, 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
-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.
+Depends:    ${python:Depends},
+            ${misc:Depends},
+            salt-common
+Description: This package represents the client package for salt
+ This package is a powerful remote execution manager that can be used
+ to administer servers in a fast and efficient way.
  .
  It allows commands to be executed across large groups of servers. This
  means systems can be easily managed, but data can also be easily gathered.
@@ -30,3 +87,29 @@ Description: This package provides a remote manager to administer servers.
  .
  Between the remote execution system, and state management Salt addresses
  the backbone of cloud and data center management.
+ .
+ This particular package provides the worker / agent for salt.
+
+
+Package: salt-syndic
+Architecture: all
+Depends:    ${python:Depends},
+            ${misc:Depends},
+            salt-master
+Description: salt-syndic represents the master-of-masters for salt
+ This package is a powerful remote execution manager that can be used
+ to administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of servers. This
+ means systems can be easily managed, but data can also be easily gathered.
+ Quick introspection into running systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a remote
+ system. Salt addresses this problem as well, the salt state system uses
+ salt state files to define the state a server needs to be in.
+ .
+ Between the remote execution system, and state management Salt addresses
+ the backbone of cloud and data center management.
+ .
+ This particular package provides the master of masters for salt-- it enables the management
+ of multiple masters at a time.

debian/links

@@ -0,0 +1,8 @@
+usr/share/salt/salt /usr/bin/salt
+usr/share/salt/salt-master /usr/bin/salt-master
+usr/share/salt/salt-syndic /usr/bin/salt-syndic
+usr/share/salt/salt-cp /usr/bin/salt-cp
+usr/share/salt/salt-key /usr/bin/salt-key
+usr/share/salt/salt-run /usr/bin/salt-run
+usr/share/salt/salt-minion /usr/bin/salt-minion
+usr/share/salt/salt-call /usr/bin/salt-call

debian/rules

@@ -1,18 +1,15 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@
+
+#override_dh_installinit:
+#	dh_installinit --no-start --name="salt-master"
+#	dh_installinit --no-start --name="salt-minion"
+#	dh_installinit --no-start --name="salt-syndic"
 
-override_dh_installinit:
-	dh_installinit --no-start --name="salt-master"
-	dh_installinit --no-start --name="salt-minion"
-	dh_installinit --no-start --name="salt-syndic"
+get-orig-source:
+	git clone https://github.com/saltstack/salt.git
+	mv salt salt-0.9.5
+	tar -zcvf salt_0.9.5.orig.tar.gz --exclude "debian*" --exclude-vcs salt-0.9.5
+	rm -rf salt-0.9.5

debian/salt-common.install

@@ -0,0 +1,9 @@
+usr/share/man/man1/salt-minion.1
+usr/share/man/man1/salt-call.1
+usr/share/man/man1/salt-key.1
+usr/share/man/man1/salt-master.1
+usr/share/man/man1/salt-syndic.1
+usr/share/man/man1/salt-cp.1
+usr/share/man/man1/salt.1
+conf/minion /etc/salt/minion
+salt/* /usr/share/salt/

debian/salt.salt-master.init → debian/salt-master.init

@@ -29,7 +29,7 @@ DEBIAN_VERSION=/etc/debian_version
 SUSE_RELEASE=/etc/SuSE-release
 # Source function library.
 if [ -f $DEBIAN_VERSION ]; then
-   break   
+   break
 elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
     . /etc/rc.status
 else
@@ -46,11 +46,11 @@ PROC_LIST=""
 RETVAL=0
 
 findproc() {
-    PROC_LIST=`$PS_CMD | grep $PROCESS | grep -v grep | grep -v sh | grep -v vi | awk '{ print $1 }'`
+    PROC_LIST=`$PS_CMD | grep 'bin/python.*salt-master' | grep -v grep | grep -v sh | grep -v vi | awk '{ print $1 }'`
 }
 
 start() {
-    echo -n $"Starting salt-master daemon: "
+    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
@@ -72,7 +72,7 @@ start() {
 }
 
 stop() {
-    echo -n $"Stopping salt-master daemon: "
+    echo -n "Stopping salt-master daemon: "
     if [ -f $SUSE_RELEASE ]; then
         killproc -TERM /usr/bin/salt-master
         rc_status -v
@@ -131,7 +131,7 @@ case "$1" in
         RETVAL=$?
         ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+        echo "Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
         exit 1
         ;;
 esac

debian/salt-master.install

@@ -0,0 +1 @@
+conf/master /etc/salt/master

debian/salt-master.manpages

@@ -0,0 +1,6 @@
+doc/man/salt.7
+doc/man/salt.1
+doc/man/salt-master.1
+doc/man/salt-key.1
+doc/man/salt-cp.1
+doc/man/salt-run.1