Permalink
Browse files

Debian/Ubuntu package for upstream acceptance

Applying latest changes for packaging

Fixed typos in man pages

Latest round of changes

More packaging fixups

Fixed salt-common typo

Fixed wildcarding in install files

Removed extra man pages

Removed trailing slash

Fixed links

Moved binaries to proper packages

Fixed man pages

Pathing

Perms tweak

Missing files

Fixed spacing

Fixed another lintian error

build the msgpack stuff

Updating rules and install files

Fixed shebang

Control updates

Fixed copyright file

Fixed lintian

Fixed overrides

cmd.retcode no longer uses subprocess.call since it is broken

fix issue with source_hash and trailing whitespace

Bye-bye pickle, hello msgpack

Add docs for new source powers

Add support for source_hash to be a source hash string

add pure python template type

add return clarifying that no states were found if no states are found

change some strings to use format

add code to cache jobs on the minion if option is set

serialize cache data

was caching the wrong line data

Add cache_jobs to the minion config template

add docs for new config param cache_jobs

make the minions return to the master in addition to returning to
returners

Add capability to designate multiple returns

only run the apache module if apachectl is installed

only load solr module if solr is installed

Debug statement used the wrong variable.

Only load nginx on machines that have nginx installed

Make it more like the apache module
  • Loading branch information...
1 parent 1607550 commit dfd82ad0bd33d892e0025d76a70997e2f1ebb1f2 @QuinnyPig QuinnyPig committed Jan 16, 2012
View
@@ -29,10 +29,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
View
@@ -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)
View
@@ -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.
View
@@ -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 <thatch45@gmail.com>
+Copyright: 2012 Thomas S Hatch <thatch45@gmail.com>
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.
View
@@ -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.
View
@@ -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"
View
@@ -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
@@ -0,0 +1 @@
+doc/man/salt.7
@@ -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
@@ -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
@@ -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
@@ -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
View
@@ -0,0 +1,2 @@
+usr/share/salt/salt-minion /usr/bin/salt-minion
+usr/share/salt/salt-call /usr/bin/salt-call
@@ -0,0 +1 @@
+scripts/salt-syndic /usr/share/salt
View
@@ -0,0 +1 @@
+usr/share/salt/salt-syndic /usr/bin/salt-syndic
View
@@ -1,9 +0,0 @@
-doc/man/salt.1
-doc/man/salt.7
-doc/man/salt-call.1
-doc/man/salt-cp.1
-doc/man/salt-key.1
-doc/man/salt-master.1
-doc/man/salt-minion.1
-doc/man/salt-run.1
-doc/man/salt-syndic.1
View
@@ -61,7 +61,7 @@ The timeout in seconds to wait for replies from the salt minions.
.INDENT 0.0
.TP
.B \-E, \-\-pcre
-The target expresion will be interpereted as a pcre regular expression
+The target expression will be interpereted as a pcre regular expression
rather than a shell glob.
.UNINDENT
.INDENT 0.0
@@ -74,8 +74,8 @@ example: server1.foo.bar,server2.foo.bar,example7.quo.qux
.TP
.B \-G, \-\-grain
The target expression matches values returned by the salt grains system on
-the minions. The target expresion is in the format of \(aq<grain value>:<pcre
-regular expresion>\(aq; example: \(aqos:Arch.*\(aq
+the minions. The target expression is in the format of \(aq<grain value>:<pcre
+regular expression>\(aq; example: \(aqos:Arch.*\(aq
.UNINDENT
.INDENT 0.0
.TP
View
@@ -7827,7 +7827,7 @@ extra information needs to be sent with the publications, the order_masters
option makes sure that the extra data is sent out.
.SS Running the Syndic
.sp
-The Syndic is a seperate daemon that needs to be started on the master that is
+The Syndic is a separate daemon that needs to be started on the master that is
controlled by a higher master. Starting the Syndic daemon is the same as
starting the other Salt daemons.
.sp
@@ -8149,7 +8149,7 @@ def get_file(path, dest, env=\(aqbase\(aq):
# syndic servers(s) below it set the "order_masters" setting to True, if this
# is a master that will be running a syndic daemon for passthrough the
# "syndic_master" setting needs to be set to the location of the master server
-# to recieve commands from
+# to receive commands from
#
# Set the order_masters setting to True if this master will command lower
# masters\(aq syndic interfaces
@@ -8608,7 +8608,7 @@ master. Using the syndic is simple, if this is a master that will have
syndic servers(s) below it set the "order_masters" setting to True, if this
is a master that will be running a syndic daemon for passthrough the
"syndic_master" setting needs to be set to the location of the master server
-to recieve commands from
+to receive commands from
.SS \fBorder_masters\fP
.sp
Default: \fBFalse\fP
@@ -9443,7 +9443,7 @@ The timeout in seconds to wait for replies from the salt minions.
.INDENT 0.0
.TP
.B \-E, \-\-pcre
-The target expresion will be interpereted as a pcre regular expression
+The target expression will be interpereted as a pcre regular expression
rather than a shell glob.
.UNINDENT
.INDENT 0.0
@@ -9456,8 +9456,8 @@ example: server1.foo.bar,server2.foo.bar,example7.quo.qux
.TP
.B \-G, \-\-grain
The target expression matches values returned by the salt grains system on
-the minions. The target expresion is in the format of \(aq<grain value>:<pcre
-regular expresion>\(aq; example: \(aqos:Arch.*\(aq
+the minions. The target expression is in the format of \(aq<grain value>:<pcre
+regular expression>\(aq; example: \(aqos:Arch.*\(aq
.UNINDENT
.INDENT 0.0
.TP
@@ -11192,5 +11192,4 @@ Thomas S. Hatch <thatch@gmail.com> and many others, please see the Authors file
.SH COPYRIGHT
2011, Thomas S. Hatch
.\" Generated by docutils manpage writer.
-.\"
.
View
@@ -36,7 +36,7 @@ Options
.. option:: -E, --pcre
- The target expresion will be interpereted as a pcre regular expression
+ The target expression will be interpereted as a pcre regular expression
rather than a shell glob.
.. option:: -L, --list
@@ -47,8 +47,8 @@ Options
.. option:: -G, --grain
The target expression matches values returned by the salt grains system on
- the minions. The target expresion is in the format of '<grain value>:<pcre
- regular expresion>'; example: 'os:Arch.*'
+ the minions. The target expression is in the format of '<grain value>:<pcre
+ regular expression>'; example: 'os:Arch.*'
.. option:: -Q, --query
@@ -99,8 +99,27 @@ The location for minion cache data.
cachedir: /var/cache/salt
+.. conf_minion:: cache_jobs
+
+``cache_jobs``
+--------------
+
+Default: ``False``
+
+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
+
+.. code-block:: yaml
+
+ cache_jobs: False
+
.. conf_minion:: acceptance_wait_time
+``acceptance_wait_time``
+------------------------
+
Default: ``10``
The number of seconds to wait until attempting to re-authenticate with the
View
@@ -45,9 +45,10 @@ contains a viable, and transparent, AMQ broker inside the daemon. Salt uses
public keys for authentication with the master daemon, then uses faster AES
encryption for payload communication, this means that authentication and
encryption are also built into Salt. Salt takes advantage of communication via
-Python pickles, enabling fast and light network traffic.
+`msgpack`_, enabling fast and light network traffic.
.. _`ZeroMQ`: http://www.zeromq.org/
+.. _`msgpack`: http://msgpack.org/
Python client interface
=======================
View
0 salt/__init__.py 100755 → 100644
No changes.
View
@@ -80,6 +80,7 @@ def minion_config(path):
'pki_dir': '/etc/salt/pki',
'id': socket.getfqdn(),
'cachedir': '/var/cache/salt',
+ 'cache_jobs': False,
'conf_file': path,
'renderer': 'yaml_jinja',
'failhard': False,
View
0 salt/log.py 100755 → 100644
No changes.
Oops, something went wrong.

0 comments on commit dfd82ad

Please sign in to comment.