Merge branch '0.9.5'

.gitignore

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

AUTHORS

@@ -21,10 +21,53 @@ documentation is being maintained by Seth
 Developers
 ----------------------------
 
-Pedro Algarvio, aka, s0undt3ch
+Aaron Bull Schaefer <[email protected]>
+Aaron Toponce <[email protected]>
+Antti Kaihola <[email protected]>
+archme <[email protected]>
+Brad Barden <[email protected]>
+Brian Wagner <[email protected]>
+Carlo Pires <[email protected]>
+Chris Scheller <[email protected]>
+Christer Edwards <[email protected]>
+Clint Savage <[email protected]>
+Corey Quinn <[email protected]>
+David Boucha <[email protected]>
+Doug Renn <[email protected]>
+Eivind Uggedal <[email protected]>
+[email protected] <[email protected]>
+Eric Poelke <[email protected]>
+Erik Nolte <[email protected]>
+Evan Borgstrom <[email protected]>
+Jed Glazner <[email protected]>
+Jeffrey C. Ollie <[email protected]>
+Jeff Schroeder <[email protected]>
+Jonas Buckner <[email protected]>
+Joseph Hall <[email protected]>
+Kent Tenney <[email protected]>
+Markus Gattol <[email protected]>
+Martin Schnabel <[email protected]>
+Matthew Printz <[email protected]>
+Matthias Teege <[email protected]>
+Maxim Burgerhout <[email protected]>
+Mitch Anderson <[email protected]>
+Nathaniel Whiteinge <[email protected]>
+Nigel Owen <nigelowen2.gmail.com>
+Pedro Algarvio <[email protected]>
+Pierre Carrier <[email protected]>
+Seth House <[email protected]>
+Seth Vidal <[email protected]>
+Thomas Schreiber <[email protected]>
+Thomas S Hatch <[email protected]>
+Tor Hveem <[email protected]>
+Travis Cline <[email protected]>
+Wieland Hoffmann <[email protected]>
 
-Joseph P. Hall
 
-Erik Nolte
+Growing Community
+--------------------------------
 
-Matthias Teege
+Salt is a rapidly growing project with a large community, to view all
+contributors please check ohloh, this file can sometimes be out of date:
+
+https://www.ohloh.net/p/salt/contributors

MANIFEST.in

@@ -0,0 +1 @@
+include salt/msgpack/*.h

conf/master

@@ -14,7 +14,8 @@
 # The port used by the communication interface
 #ret_port: 4506
 
-# The root directory prepended to these options: pki_dir, cachedir, log_file.
+# The root directory prepended to these options: pki_dir, cachedir,
+# sock_dir, log_file.
 #root_dir: /
 
 # Directory used to store public key data
@@ -29,24 +30,33 @@
 # Set the directory used to hold unix sockets
 #sock_dir: /tmp/salt-unix
 
+# Set the acceptance level for serialization of messages. This should only be
+# set if the master is newer that 0.9.5 and the minion are older, this option
+# allows a 0.9.5 and newer master to communicate with minions 0.9.4 and
+# earlier. It is not recommended to keep this setting on if the minions are
+# all 0.9.5 or higher, as leaving pickle as the serialization medium is slow
+# and opens up security risks
+#
+#serial: msgpack
+
 #####        Security settings       #####
 ##########################################
 # 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     #####
 ##########################################
 # The state system uses a "top" file to tell the minions what environment to
 # use and what modules to use. The state_top file is defined relative to the
 # root of the base environment
-#state_top: top.yml
+#state_top: top.sls
 #
 # The renderer to use on the minions to render the state data
 #renderer: yaml_jinja
@@ -162,9 +172,19 @@
 # Logger levels can be used to tweak specific loggers logging levels.
 # Imagine you want to have the salt library at the 'warning' level, but, you
 # still wish to have 'salt.modules' at the 'debug' level:
-#   log_granular_levels: {
+#   log_granular_levels:
 #     'salt': 'warning',
 #     'salt.modules': 'debug'
-#   }
 #
 #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: '[email protected],bar.domain.com,baz.domain.com and bl*.domain.com',
+#   group2: 'G@os:Debian and foo.domain.com',
+

conf/minion

@@ -28,6 +28,13 @@
 # Where cache data goes
 #cachedir: /var/cache/salt
 
+# 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
+
+
+
 #####   Minion module management     #####
 ##########################################
 # Disable specific modules, this will allow the admin to limit the level os
@@ -59,8 +66,22 @@
 #
 #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
+#
+# autoload_dynamic_modules Turns on automatic loading of modules found in the
+# environments on the master. This is turned on by default, to turn of
+# autoloading modules when states run set this value to False
+#autoload_dynamic_modules: True
+#
+# clean_dynamic_modules keeps the dynamic modules on the minion in sync with
+# the dynamic modules on the master, this means that if a dynamic module is
+# not on the master it will be deleted from the minion. By default this is
+# enabled and can be disabled by changing this value to False
+#clean_dynamic_modules: True
 
 ######        Security settings       #####
 ###########################################
@@ -96,7 +117,6 @@
 #
 #log_granular_levels: {}
 
-
 ######      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 <[email protected]>  Sun, 27 Nov 2011 16:11:36 -0700
+ -- Corey Quinn <[email protected]>  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 <[email protected]>  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 <[email protected]>  Wed, 25 Nov 2011 11:19:00 -0600
-
-salt (0.9.4.pre-1) lucid; urgency=low
-
-  * Build PPA for Ubuntu
-
- -- Seth House <[email protected]>  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 <[email protected]>  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 <[email protected]>  Wed, 28 Sep 2011 01:21:48 -0600

debian/control

@@ -1,24 +1,81 @@
 Source: salt
 Section: admin
 Priority: optional
-Maintainer: Aaron Toponce <[email protected]>
-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 <[email protected]>
+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