Permalink
Browse files

Merge branch '0.9.5'

  • Loading branch information...
2 parents bc2f98a + 6cc4993 commit 812c439b79891d518cfe90c63ca67d1960a49c22 @thatch45 thatch45 committed Jan 15, 2012
Showing with 19,511 additions and 2,156 deletions.
  1. +4 −0 .gitignore
  2. +47 −4 AUTHORS
  3. +1 −0 MANIFEST.in
  4. +26 −6 conf/master
  5. +23 −3 conf/minion
  6. +0 −30 debian/AUTHORS
  7. +3 −33 debian/changelog
  8. +96 −13 debian/control
  9. +0 −1 debian/files
  10. +8 −0 debian/links
  11. +0 −13 debian/patches/no-license
  12. +0 −1 debian/patches/series
  13. +11 −14 debian/rules
  14. +9 −0 debian/salt-common.install
  15. +5 −5 debian/{salt.salt-master.init → salt-master.init}
  16. +1 −0 debian/salt-master.install
  17. +6 −0 debian/salt-master.manpages
  18. +6 −6 debian/{salt.salt-minion.init → salt-minion.init}
  19. +4 −0 debian/salt-minion.install
  20. +2 −0 debian/salt-minion.manpages
  21. +7 −7 debian/{salt.salt-syndic.init → salt-syndic.init}
  22. 0 debian/salt-syndic.install
  23. +1 −0 debian/salt-syndic.manpages
  24. +0 −48 debian/salt.debhelper.log
  25. +0 −20 debian/salt.postinst.debhelper
  26. +0 −15 debian/salt.postrm.debhelper
  27. +0 −5 debian/salt.prerm.debhelper
  28. +0 −3 debian/salt.substvars
  29. +6 −4 doc/_templates/indexsidebar.html
  30. +6 −4 doc/conf.py
  31. +7 −0 doc/gen_gource
  32. +1 −1 doc/man/salt-call.1
  33. +2 −2 doc/man/salt-cp.1
  34. +1 −1 doc/man/salt-key.1
  35. +1 −1 doc/man/salt-master.1
  36. +1 −1 doc/man/salt-minion.1
  37. +1 −1 doc/man/salt-run.1
  38. +1 −1 doc/man/salt-syndic.1
  39. +60 −3 doc/man/salt.1
  40. +1,912 −564 doc/man/salt.7
  41. +38 −1 doc/ref/cli/index.rst
  42. +1 −1 doc/ref/cli/salt-cp.rst
  43. +50 −2 doc/ref/cli/salt.rst
  44. +132 −31 doc/ref/configuration/master.rst
  45. +240 −1 doc/ref/configuration/minion.rst
  46. +6 −0 doc/ref/file_server/dynamic-modules.rst
  47. +1 −1 doc/ref/runners.rst
  48. +51 −0 doc/ref/states/writing.rst
  49. +4 −7 doc/topics/community.rst
  50. +58 −52 doc/topics/installation.rst
  51. +1 −0 doc/topics/releases/0.9.4.rst
  52. +388 −0 doc/topics/releases/0.9.5.rst
  53. +245 −0 doc/topics/tutorials/freebsd.rst
  54. +457 −0 doc/topics/tutorials/starting_states.rst
  55. +1 −1 doc/topics/tutorials/states_pt2.rst
  56. +8 −6 pkg/arch/PKGBUILD
  57. +6 −5 pkg/arch/PKGBUILD-git
  58. +2 −3 pkg/rpm/salt-master
  59. +10 −0 pkg/rpm/salt-master.service
  60. +0 −1 pkg/rpm/salt-minion
  61. +10 −0 pkg/rpm/salt-minion.service
  62. +0 −1 pkg/rpm/salt-syndic
  63. +10 −0 pkg/rpm/salt-syndic.service
  64. +196 −49 pkg/rpm/salt.spec
  65. +54 −25 salt/__init__.py
  66. +101 −35 salt/cli/__init__.py
  67. +38 −18 salt/cli/caller.py
  68. +4 −4 salt/cli/cp.py
  69. +22 −18 salt/client.py
  70. +31 −22 salt/config.py
  71. +23 −26 salt/crypt.py
  72. +60 −0 salt/exceptions.py
  73. +330 −55 salt/grains/core.py
  74. +43 −27 salt/loader.py
  75. +13 −6 salt/log.py
  76. +71 −41 salt/master.py
  77. +265 −62 salt/minion.py
  78. +42 −18 salt/modules/apache.py
  79. +37 −20 salt/modules/apt.py
  80. +1 −1 salt/modules/archive.py
  81. +58 −53 salt/modules/cmd.py
  82. +51 −1 salt/modules/cp.py
  83. +11 −3 salt/modules/cron.py
  84. +87 −0 salt/modules/data.py
  85. +54 −14 salt/modules/disk.py
  86. +6 −6 salt/modules/ebuild.py
  87. +230 −11 salt/modules/file.py
  88. +127 −0 salt/modules/freebsdkmod.py
  89. +2 −3 salt/modules/freebsdpkg.py
  90. +163 −0 salt/modules/gentoo_service.py
  91. +18 −4 salt/modules/grains.py
  92. +2 −2 salt/modules/groupadd.py
  93. +30 −10 salt/modules/hosts.py
  94. +9 −11 salt/modules/kmod.py
  95. +13 −4 salt/modules/linux_sysctl.py
  96. +4 −4 salt/modules/moosefs.py
  97. +3 −3 salt/modules/mount.py
  98. +419 −7 salt/modules/mysql.py
  99. +18 −23 salt/modules/network.py
  100. +4 −4 salt/modules/pacman.py
  101. +71 −0 salt/modules/pip.py
  102. +61 −9 salt/modules/ps.py
  103. +14 −5 salt/modules/publish.py
  104. +2 −2 salt/modules/pw_group.py
  105. +3 −3 salt/modules/pw_user.py
  106. +183 −0 salt/modules/rh_service.py
  107. +140 −0 salt/modules/saltutil.py
  108. +13 −5 salt/modules/selinux.py
  109. +20 −2 salt/modules/service.py
  110. +2 −2 salt/modules/shadow.py
  111. +485 −273 salt/modules/solr.py
  112. +3 −3 salt/modules/ssh.py
  113. +32 −1 salt/modules/state.py
  114. +11 −16 salt/modules/status.py
  115. +166 −0 salt/modules/systemd.py
  116. +11 −0 salt/modules/test.py
  117. +3 −3 salt/modules/tomcat.py
  118. +20 −11 salt/modules/useradd.py
  119. +35 −10 salt/modules/virt.py
  120. +57 −0 salt/modules/virtualenv.py
  121. +60 −0 salt/modules/win_disk.py
  122. +202 −0 salt/modules/win_service.py
  123. +192 −0 salt/modules/win_useradd.py
  124. +74 −38 salt/modules/yumpkg.py
  125. +231 −0 salt/modules/yumpkg5.py
  126. +20 −0 salt/msgpack/__init__.py
  127. +1 −0 salt/msgpack/__version__.py
  128. +6,762 −0 salt/msgpack/_msgpack.c
  129. +427 −0 salt/msgpack/_msgpack.pyx
  130. +107 −0 salt/msgpack/pack.h
  131. +25 −0 salt/msgpack/pack_define.h
  132. +686 −0 salt/msgpack/pack_template.h
  133. +94 −0 salt/msgpack/sysdep.h
  134. +213 −0 salt/msgpack/unpack.h
  135. +92 −0 salt/msgpack/unpack_define.h
  136. +386 −0 salt/msgpack/unpack_template.h
  137. +23 −16 salt/output.py
  138. +49 −4 salt/payload.py
  139. +5 −7 salt/renderers/json_jinja.py
  140. +13 −5 salt/renderers/yaml_jinja.py
  141. +6 −0 salt/renderers/yaml_mako.py
  142. +47 −0 salt/returners/cassandra_return.py
  143. +1 −1 salt/returners/mongo_return.py
  144. +1 −1 salt/runner.py
  145. +124 −33 salt/state.py
  146. +42 −6 salt/states/cmd.py
  147. +3 −3 salt/states/cron.py
  148. +449 −83 salt/states/file.py
  149. +1 −1 salt/states/host.py
  150. +10 −10 salt/states/mount.py
  151. +61 −0 salt/states/mysql_database.py
  152. +66 −0 salt/states/mysql_user.py
  153. +64 −27 salt/states/pkg.py
  154. +225 −26 salt/states/service.py
  155. +4 −4 salt/states/ssh_auth.py
  156. +121 −0 salt/states/virtualenv.py
  157. +62 −12 salt/utils/__init__.py
  158. +1 −2 salt/utils/find.py
  159. +76 −0 salt/utils/jinja.py
  160. +36 −0 salt/utils/saltminionservice.py
  161. +42 −0 salt/utils/verify.py
  162. +82 −0 salt/utils/winservice.py
  163. +2 −0 salt/version.py
  164. +4 −1 scripts/salt
  165. +6 −1 scripts/salt-call
  166. +4 −1 scripts/salt-cp
  167. +4 −1 scripts/salt-key
  168. 0 scripts/salt-master
  169. +2 −6 scripts/salt-minion
  170. +4 −1 scripts/salt-run
  171. 0 scripts/salt-syndic
  172. +61 −8 setup.py
  173. +13 −0 tests/modules/__init__.py
  174. +11 −0 tests/modules/files/hosts
  175. +89 −0 tests/modules/hosts.py
  176. +7 −0 tests/modules/test.py
  177. +39 −0 tests/runtests.py
  178. +8 −0 tests/simple.py
  179. 0 tests/templates/__init__.py
  180. +3 −0 tests/templates/files/test/hello_import
  181. +1 −0 tests/templates/files/test/hello_include
  182. +1 −0 tests/templates/files/test/hello_simple
  183. +4 −0 tests/templates/files/test/macro
  184. +112 −0 tests/templates/jinja.py
View
@@ -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
View
51 AUTHORS
@@ -21,10 +21,53 @@ documentation is being maintained by Seth
Developers
----------------------------
-Pedro Algarvio, aka, s0undt3ch
+Aaron Bull Schaefer <aaron@elasticdog.com>
+Aaron Toponce <aaron.toponce@gmail.com>
+Antti Kaihola <akaihol+github@ambitone.com>
+archme <archme.mail@gmail.com>
+Brad Barden <brad@mifflinet.net>
+Brian Wagner <wags@wagsworld.net>
+Carlo Pires <carlopires@gmail.com>
+Chris Scheller <schelcj@umich.edu>
+Christer Edwards <christer.edwards@gmail.com>
+Clint Savage <herlo1@gmail.com>
+Corey Quinn <corey@sequestered.net>
+David Boucha <boucha@gmail.com>
+Doug Renn <renn@nestegg.com>
+Eivind Uggedal <eivind@uggedal.com>
+epoelke@gmail.com <epoelke@heartflow.com>
+Eric Poelke <epoelke@gmail.com>
+Erik Nolte <enolte@beyondoblivion.com>
+Evan Borgstrom <evan@fatbox.ca>
+Jed Glazner <jglazner@coldcrow.com>
+Jeffrey C. Ollie <jeff@ocjtech.us>
+Jeff Schroeder <jeffschroeder@computer.org>
+Jonas Buckner <buckner.jonas@gmail.com>
+Joseph Hall <perlhoser@gmail.com>
+Kent Tenney <ktenney@gmail.com>
+Markus Gattol <markus.gattol@sunoano.org>
+Martin Schnabel <mb0@mb0.org>
+Matthew Printz <hipokrit@gmail.com>
+Matthias Teege <matthias-git@mteege.de>
+Maxim Burgerhout <maxim@wzzrd.com>
+Mitch Anderson <mitch@metauser.net>
+Nathaniel Whiteinge <seth@eseth.com>
+Nigel Owen <nigelowen2.gmail.com>
+Pedro Algarvio <pedro@algarvio.me>
+Pierre Carrier <pierre@spotify.com>
+Seth House <seth@eseth.com>
+Seth Vidal <skvidal@fedoraproject.org>
+Thomas Schreiber <tom@rizumu.us>
+Thomas S Hatch <thatch45@gmail.com>
+Tor Hveem <xt@bash.no>
+Travis Cline <travis.cline@gmail.com>
+Wieland Hoffmann <themineo+github@gmail.com>
-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
View
@@ -0,0 +1 @@
+include salt/msgpack/*.h
View
@@ -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: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com',
+# group2: 'G@os:Debian and foo.domain.com',
+
View
@@ -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
View
@@ -1,30 +0,0 @@
-=============
-Salt Authors
-=============
-
-Whos Who in Salt
-============================
-
-The Man With the Plan
-----------------------------
-
-Thomas S Hatch is the main developer of Salt. He is the founder, owner,
-maintainer and lead of the Salt project, as well as author of the majority
-of the Salt code and documentation.
-
-Documentation System
-----------------------------
-
-The documentation system was put together by Seth House, much of the
-documentation is being maintained by Seth
-
-Developers
-----------------------------
-
-Pedro Algarvio, aka, s0undt3ch
-
-Joseph P. Hall
-
-Erik Nolte
-
-Matthias Teege
View
@@ -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
View
@@ -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.
View
@@ -1 +0,0 @@
-salt_0.9.4-1_all.deb admin optional
View
@@ -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
Oops, something went wrong.

0 comments on commit 812c439

Please sign in to comment.