Merge branch '0.9.6'

MANIFEST.in

@@ -1 +1,3 @@
-include salt/msgpack/*.h
+include AUTHORS
+include LICENSE
+include README.rst

conf/master → conf/master.template

@@ -1,3 +1,4 @@
+# DO NOT MODIFY THIS FILE.  Copy it to: /etc/salt/master
 ##### Primary configuration settings #####
 ##########################################
 # The address of the interface to bind to
@@ -6,6 +7,9 @@
 # The port used by the publisher
 #publish_port: 4505
 
+# The user to run salt
+#user: root
+
 # The number of worker threads to start, these threads are used to manage
 # return calls made from minions to the master, if the master seems to be
 # running slowly, increase the number of threads
@@ -85,9 +89,9 @@
 #   prod:
 #     - /srv/salt/prod/services
 #     - /srv/salt/prod/states
-# 
+#
 # Default:
-#file_roots: 
+#file_roots:
 #  base:
 #    - /srv/salt
 
@@ -183,7 +187,7 @@
 ##########################################
 # 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 → conf/minion.template

@@ -1,3 +1,4 @@
+# DO NOT MODIFY THIS FILE.  Copy it to: /etc/salt/minion
 ##### Primary configuration settings #####
 ##########################################
 # Set the location of the salt master server, if the master server cannot be
@@ -7,6 +8,9 @@
 # Set the post used by the master reply and authentication server
 #master_port: 4506
 
+# The user to run salt
+#user: root
+
 # The root directory prepended to these options: pki_dir, cachedir, log_file.
 #root_dir: /
 
@@ -28,10 +32,16 @@
 # Where cache data goes
 #cachedir: /var/cache/salt
 
+# The minion can locally cache the return data from jobs sent to it, this
+# can be a good way to keep track minion side of the jobs the minion has
+# executed. By default this feature is disabled, to enable set cache_jobs
+# to True
+#cache_jobs: False
+
 # 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
+# continuously attempt to reconnect until successful. This is the time, in
 # seconds, between those reconnection attempts.
-# acceptance_wait_time = 10
+#acceptance_wait_time = 10
 
 
 

debian/changelog

@@ -1,4 +1,4 @@
-salt (0.9.5+git20111227.g8182e48-1) unstable; urgency=low
+salt (0.9.5-1) unstable; urgency=low
 
   * First package release. (Closes: #643789)
 

debian/control

@@ -7,14 +7,11 @@ Build-Depends: debhelper (>= 7.0.50~),
                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-all-dev,
                python-jinja2
 Standards-Version: 3.9.2
 Homepage: http://saltstack.org
@@ -24,8 +21,20 @@ Homepage: http://saltstack.org
 
 Package: salt-common
 Architecture: any
-Depends:    ${python:Depends},
-            ${misc:Depends}
+Depends: ${python:Depends},
+         ${misc:Depends},
+         ${shlibs:Depends},
+         python-support,
+         cython,
+         python-setuptools,
+         python-yaml,
+         python-crypto,
+         python-m2crypto,
+         python-zmq (>= 2.1.9),
+         libzmq-dev (>= 2.1.9),
+         python,
+         python-dev,
+         python-jinja2
 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.
@@ -41,15 +50,14 @@ Description: Shared libraries that salt requires for all packages
  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.
-
+ 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
+Depends: ${misc:Depends},
+         python,
+         salt-common (>= ${source:Version})
 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.
@@ -70,9 +78,9 @@ Description: This package provides a remote manager to administer servers via sa
 
 Package: salt-minion
 Architecture: all
-Depends:    ${python:Depends},
-            ${misc:Depends},
-            salt-common
+Depends: ${misc:Depends},
+         python,
+         salt-common (>= ${source:Version})
 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.
@@ -93,10 +101,10 @@ Description: This package represents the client package for salt
 
 Package: salt-syndic
 Architecture: all
-Depends:    ${python:Depends},
-            ${misc:Depends},
-            salt-master
-Description: salt-syndic represents the master-of-masters for salt
+Depends: ${misc:Depends},
+         python,
+         salt-master (>= ${source:Version})
+Description: This package 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.
  .
@@ -111,5 +119,5 @@ Description: salt-syndic represents the master-of-masters for salt
  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.
+ This particular package provides the master of masters for salt-- it enables
+ the management of multiple masters at a time.

debian/copyright

@@ -1,10 +1,10 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: salt
-Upstream-Contact: Aaron Toponce <aaron.toponce@gmail.com>
-Source: http://github.com/thatch45/salt/
+Upstream-Contact: salt-users@googlegroups.com
+Source: https://github.com/downloads/saltstack/salt/salt-0.9.5.tar.gz
 
 Files: *
-Copyright: 2011 Thomas S Hatch <[email protected]>
+Copyright: 2012 Thomas S Hatch <[email protected]>
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

debian/lintian-overrides

@@ -0,0 +1,3 @@
+salt-common: manpage-has-errors-from-man usr/share/man/man7/salt.7.gz
+# The man page renders correctly, no need for lintian to get upset about
+# it.

debian/rules

@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
-
+#export DH_VERBOSE=1
 %:
-	dh $@
-
+	dh $@ --buildsystem=python_distutils
 #override_dh_installinit:
 #	dh_installinit --no-start --name="salt-master"
 #	dh_installinit --no-start --name="salt-minion"

debian/salt-common.install

@@ -1,9 +1,25 @@
-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/
+salt/exceptions.py /usr/share/salt
+salt/loader.py /usr/share/salt
+salt/master.py /usr/share/salt
+salt/client.py /usr/share/salt
+salt/runner.py /usr/share/salt
+salt/output.py /usr/share/salt
+salt/minion.py /usr/share/salt
+salt/version.py /usr/share/salt
+salt/config.py /usr/share/salt
+salt/state.py /usr/share/salt
+salt/log.py /usr/share/salt
+salt/__init__.py /usr/share/salt
+salt/payload.py /usr/share/salt
+salt/crypt.py /usr/share/salt
+salt/runners /usr/share/salt/
+salt/renderers /usr/share/salt/
+salt/returners /usr/share/salt/
+salt/ext /usr/share/salt/
+salt/msgpack /usr/share/salt/
+salt/grains /usr/share/salt/
+salt/cli /usr/share/salt/
+salt/states /usr/share/salt/
+salt/utils /usr/share/salt/
+usr/lib/python2*/dist-packages/salt/msgpack
+debian/lintian-overrides /usr/share/lintian/overrides/salt-common

debian/salt-common.manpages

@@ -0,0 +1 @@
+doc/man/salt.7

debian/salt-master.install

@@ -1 +1,6 @@
-conf/master /etc/salt/master
+conf/master.template /etc/salt/master
+scripts/salt-key /usr/share/salt
+scripts/salt /usr/share/salt
+scripts/salt-run /usr/share/salt
+scripts/salt-cp /usr/share/salt
+scripts/salt-master /usr/share/salt

debian/links → debian/salt-master.links

@@ -1,8 +1,5 @@
 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/salt-master.manpages

@@ -1,6 +1,5 @@
-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-key.1
+doc/man/salt-master.1
 doc/man/salt-run.1

debian/salt-minion.install

@@ -1,4 +1,4 @@
-scripts/salt-minion /usr/share/salt/salt-minion
-scripts/salt-call /usr/share/salt/salt-call
-modules/* /usr/share/salt/modules/
-conf/minion /etc/salt/minion
+scripts/salt-minion /usr/share/salt
+scripts/salt-call /usr/share/salt
+salt/modules /usr/share/salt/modules
+conf/minion.template /etc/salt/minion

debian/salt-minion.links

@@ -0,0 +1,2 @@
+usr/share/salt/salt-minion /usr/bin/salt-minion
+usr/share/salt/salt-call /usr/bin/salt-call

debian/salt-syndic.install

@@ -0,0 +1 @@
+scripts/salt-syndic /usr/share/salt

debian/salt-syndic.links

@@ -0,0 +1 @@
+usr/share/salt/salt-syndic /usr/bin/salt-syndic