Skip to content

Commit c21a932

Browse files
thatch45thatch45
committed
Merge branch '0.9.6'
2 parents b9dc071 + 6804c86 commit c21a932

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+4841
-10404
lines changed

‎MANIFEST.in

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
include salt/msgpack/*.h
1+
include AUTHORS
2+
include LICENSE
3+
include README.rst

‎conf/master ‎conf/master.template

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT MODIFY THIS FILE. Copy it to: /etc/salt/master
12
##### Primary configuration settings #####
23
##########################################
34
# The address of the interface to bind to
@@ -6,6 +7,9 @@
67
# The port used by the publisher
78
#publish_port: 4505
89

10+
# The user to run salt
11+
#user: root
12+
913
# The number of worker threads to start, these threads are used to manage
1014
# return calls made from minions to the master, if the master seems to be
1115
# running slowly, increase the number of threads
@@ -85,9 +89,9 @@
8589
# prod:
8690
# - /srv/salt/prod/services
8791
# - /srv/salt/prod/states
88-
#
92+
#
8993
# Default:
90-
#file_roots:
94+
#file_roots:
9195
# base:
9296
# - /srv/salt
9397

@@ -183,7 +187,7 @@
183187
##########################################
184188
# Node groups allow for logical groupings of minion nodes.
185189
# A group consists of a group name and a compound target.
186-
#
190+
#
187191
# nodegroups:
188192
# group1: '[email protected],bar.domain.com,baz.domain.com and bl*.domain.com',
189193
# group2: 'G@os:Debian and foo.domain.com',

‎conf/minion ‎conf/minion.template

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT MODIFY THIS FILE. Copy it to: /etc/salt/minion
12
##### Primary configuration settings #####
23
##########################################
34
# Set the location of the salt master server, if the master server cannot be
@@ -7,6 +8,9 @@
78
# Set the post used by the master reply and authentication server
89
#master_port: 4506
910

11+
# The user to run salt
12+
#user: root
13+
1014
# The root directory prepended to these options: pki_dir, cachedir, log_file.
1115
#root_dir: /
1216

@@ -28,10 +32,16 @@
2832
# Where cache data goes
2933
#cachedir: /var/cache/salt
3034

35+
# The minion can locally cache the return data from jobs sent to it, this
36+
# can be a good way to keep track minion side of the jobs the minion has
37+
# executed. By default this feature is disabled, to enable set cache_jobs
38+
# to True
39+
#cache_jobs: False
40+
3141
# When waiting for a master to accept the minion's public key, salt will
32-
# contiuously attempt to reconnect until successful. This is the time, in
42+
# continuously attempt to reconnect until successful. This is the time, in
3343
# seconds, between those reconnection attempts.
34-
# acceptance_wait_time = 10
44+
#acceptance_wait_time = 10
3545

3646

3747

‎debian/changelog

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
salt (0.9.5+git20111227.g8182e48-1) unstable; urgency=low
1+
salt (0.9.5-1) unstable; urgency=low
22

33
* First package release. (Closes: #643789)
44

‎debian/control

+29-21
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@ Build-Depends: debhelper (>= 7.0.50~),
77
cython,
88
python-yaml,
99
python-setuptools,
10-
python-yaml,
1110
python-crypto,
1211
python-m2crypto,
1312
python-zmq (>= 2.1.9),
14-
libzmq1 (>= 2.1.9),
1513
libzmq-dev (>= 2.1.9),
16-
python (>= 2.6),
17-
python-dev (>= 2.6),
14+
python-all-dev,
1815
python-jinja2
1916
Standards-Version: 3.9.2
2017
Homepage: http://saltstack.org
@@ -24,8 +21,20 @@ Homepage: http://saltstack.org
2421

2522
Package: salt-common
2623
Architecture: any
27-
Depends: ${python:Depends},
28-
${misc:Depends}
24+
Depends: ${python:Depends},
25+
${misc:Depends},
26+
${shlibs:Depends},
27+
python-support,
28+
cython,
29+
python-setuptools,
30+
python-yaml,
31+
python-crypto,
32+
python-m2crypto,
33+
python-zmq (>= 2.1.9),
34+
libzmq-dev (>= 2.1.9),
35+
python,
36+
python-dev,
37+
python-jinja2
2938
Description: Shared libraries that salt requires for all packages
3039
This package is a powerful remote execution manager that can be used
3140
to administer servers in a fast and efficient way.
@@ -41,15 +50,14 @@ Description: Shared libraries that salt requires for all packages
4150
Between the remote execution system, and state management Salt addresses
4251
the backbone of cloud and data center management.
4352
.
44-
This particular package provides shared libraries that salt-master, salt-minion,
45-
and salt-syndic require to function.
46-
53+
This particular package provides shared libraries that salt-master,
54+
salt-minion, and salt-syndic require to function.
4755

4856
Package: salt-master
4957
Architecture: all
50-
Depends: ${python:Depends},
51-
${misc:Depends},
52-
salt-common
58+
Depends: ${misc:Depends},
59+
python,
60+
salt-common (>= ${source:Version})
5361
Description: This package provides a remote manager to administer servers via salt
5462
This package is a powerful remote execution manager that can be used
5563
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
7078

7179
Package: salt-minion
7280
Architecture: all
73-
Depends: ${python:Depends},
74-
${misc:Depends},
75-
salt-common
81+
Depends: ${misc:Depends},
82+
python,
83+
salt-common (>= ${source:Version})
7684
Description: This package represents the client package for salt
7785
This package is a powerful remote execution manager that can be used
7886
to administer servers in a fast and efficient way.
@@ -93,10 +101,10 @@ Description: This package represents the client package for salt
93101

94102
Package: salt-syndic
95103
Architecture: all
96-
Depends: ${python:Depends},
97-
${misc:Depends},
98-
salt-master
99-
Description: salt-syndic represents the master-of-masters for salt
104+
Depends: ${misc:Depends},
105+
python,
106+
salt-master (>= ${source:Version})
107+
Description: This package represents the master-of-masters for salt
100108
This package is a powerful remote execution manager that can be used
101109
to administer servers in a fast and efficient way.
102110
.
@@ -111,5 +119,5 @@ Description: salt-syndic represents the master-of-masters for salt
111119
Between the remote execution system, and state management Salt addresses
112120
the backbone of cloud and data center management.
113121
.
114-
This particular package provides the master of masters for salt-- it enables the management
115-
of multiple masters at a time.
122+
This particular package provides the master of masters for salt-- it enables
123+
the management of multiple masters at a time.

‎debian/copyright

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Format: http://dep.debian.net/deps/dep5
22
Upstream-Name: salt
3-
Upstream-Contact: Aaron Toponce <aaron.toponce@gmail.com>
4-
Source: http://github.com/thatch45/salt/
3+
Upstream-Contact: salt-users@googlegroups.com
4+
Source: https://github.com/downloads/saltstack/salt/salt-0.9.5.tar.gz
55

66
Files: *
7-
Copyright: 2011 Thomas S Hatch <[email protected]>
7+
Copyright: 2012 Thomas S Hatch <[email protected]>
88
License: Apache-2.0
99
Licensed under the Apache License, Version 2.0 (the "License");
1010
you may not use this file except in compliance with the License.

‎debian/lintian-overrides

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

‎debian/rules

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#!/usr/bin/make -f
2-
2+
#export DH_VERBOSE=1
33
%:
4-
dh $@
5-
4+
dh $@ --buildsystem=python_distutils
65
#override_dh_installinit:
76
# dh_installinit --no-start --name="salt-master"
87
# dh_installinit --no-start --name="salt-minion"

‎debian/salt-common.install

+25-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
1-
usr/share/man/man1/salt-minion.1
2-
usr/share/man/man1/salt-call.1
3-
usr/share/man/man1/salt-key.1
4-
usr/share/man/man1/salt-master.1
5-
usr/share/man/man1/salt-syndic.1
6-
usr/share/man/man1/salt-cp.1
7-
usr/share/man/man1/salt.1
8-
conf/minion /etc/salt/minion
9-
salt/* /usr/share/salt/
1+
salt/exceptions.py /usr/share/salt
2+
salt/loader.py /usr/share/salt
3+
salt/master.py /usr/share/salt
4+
salt/client.py /usr/share/salt
5+
salt/runner.py /usr/share/salt
6+
salt/output.py /usr/share/salt
7+
salt/minion.py /usr/share/salt
8+
salt/version.py /usr/share/salt
9+
salt/config.py /usr/share/salt
10+
salt/state.py /usr/share/salt
11+
salt/log.py /usr/share/salt
12+
salt/__init__.py /usr/share/salt
13+
salt/payload.py /usr/share/salt
14+
salt/crypt.py /usr/share/salt
15+
salt/runners /usr/share/salt/
16+
salt/renderers /usr/share/salt/
17+
salt/returners /usr/share/salt/
18+
salt/ext /usr/share/salt/
19+
salt/msgpack /usr/share/salt/
20+
salt/grains /usr/share/salt/
21+
salt/cli /usr/share/salt/
22+
salt/states /usr/share/salt/
23+
salt/utils /usr/share/salt/
24+
usr/lib/python2*/dist-packages/salt/msgpack
25+
debian/lintian-overrides /usr/share/lintian/overrides/salt-common

‎debian/salt-common.manpages

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doc/man/salt.7

‎debian/salt-master.install

+6-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
conf/master /etc/salt/master
1+
conf/master.template /etc/salt/master
2+
scripts/salt-key /usr/share/salt
3+
scripts/salt /usr/share/salt
4+
scripts/salt-run /usr/share/salt
5+
scripts/salt-cp /usr/share/salt
6+
scripts/salt-master /usr/share/salt

‎debian/links ‎debian/salt-master.links

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
usr/share/salt/salt /usr/bin/salt
22
usr/share/salt/salt-master /usr/bin/salt-master
3-
usr/share/salt/salt-syndic /usr/bin/salt-syndic
43
usr/share/salt/salt-cp /usr/bin/salt-cp
54
usr/share/salt/salt-key /usr/bin/salt-key
65
usr/share/salt/salt-run /usr/bin/salt-run
7-
usr/share/salt/salt-minion /usr/bin/salt-minion
8-
usr/share/salt/salt-call /usr/bin/salt-call

‎debian/salt-master.manpages

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
doc/man/salt.7
21
doc/man/salt.1
3-
doc/man/salt-master.1
4-
doc/man/salt-key.1
52
doc/man/salt-cp.1
3+
doc/man/salt-key.1
4+
doc/man/salt-master.1
65
doc/man/salt-run.1

‎debian/salt-minion.install

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scripts/salt-minion /usr/share/salt/salt-minion
2-
scripts/salt-call /usr/share/salt/salt-call
3-
modules/* /usr/share/salt/modules/
4-
conf/minion /etc/salt/minion
1+
scripts/salt-minion /usr/share/salt
2+
scripts/salt-call /usr/share/salt
3+
salt/modules /usr/share/salt/modules
4+
conf/minion.template /etc/salt/minion

‎debian/salt-minion.links

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
usr/share/salt/salt-minion /usr/bin/salt-minion
2+
usr/share/salt/salt-call /usr/bin/salt-call

‎debian/salt-syndic.install

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
scripts/salt-syndic /usr/share/salt

‎debian/salt-syndic.links

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/salt/salt-syndic /usr/bin/salt-syndic

‎debian/salt.manpages

-9
This file was deleted.

‎doc/_static/salt-vert.png

3.41 KB
Loading

0 commit comments

Comments
 (0)