Commit Graph

3202 Commits

Author SHA1 Message Date
Thomas S Hatch
856d695d39 Merge pull request #781 from blast-hardcheese/develop
Adding debconf module
2012-02-28 08:26:28 -08:00
Devon Stewart
3c162240d7 Adding debconf module
Allows getting all selections, getting a single package,
and setting the answer to a single question for a single package.
2012-02-28 02:06:33 -08:00
Thomas S Hatch
87cf685249 Merge branch 'develop' of github.com:saltstack/salt into develop
Conflicts:
	salt/minion.py
2012-02-28 00:39:12 -07:00
Thomas S Hatch
d7a2cd5a90 Merge pull request #779 from gordonm/develop
Fixes for compound matching
2012-02-27 23:35:29 -08:00
Thomas S Hatch
3e3324e5d0 fix unspecified glob match in compound matcher 2012-02-28 00:32:24 -07:00
Thomas S Hatch
ab7c16b92b move log forward so that data is more accurate 2012-02-28 00:20:14 -07:00
Gordon McAllister
04cc3863b3 Fixes for compound matching
Previously booleans were appended to the results list unnecessarily
in some cases and all matchers were evaluated twice.
2012-02-27 23:15:14 -08:00
Thomas S Hatch
a19dfbc12d fix comparison issue in compond matcher 2012-02-27 23:39:07 -07:00
Thomas S Hatch
e62e7cceb4 Fix compatability bug in user data transfer 2012-02-27 23:37:59 -07:00
Thomas S Hatch
fc7e0d984a Merge pull request #778 from cedwards/documentation
formatting and clarification cleanup in docs
2012-02-27 20:34:40 -08:00
Christer Edwards
f227c335b6 formatting and clarification cleanup in docs 2012-02-27 21:19:29 -07:00
Thomas S Hatch
707ca01952 Merge pull request #777 from grierj/contribute
Enhanced Logging For Executing User
2012-02-27 18:44:35 -08:00
Grier Johnson
14cde50cba Enhanced Logging For Executing User
Track the executing user and do some best effort work to figure out who
it is based on environment variables.  Pass the user in the payload
and allow for logging of summary information about the job the user
ran, but also allow for a raw dump of the user's target, arguments,
etc.
This aids in auditability of a user on a system trying to figure out
what made a change and when.
2012-02-27 15:39:58 -08:00
Thomas S Hatch
205cc1a5b4 Merge pull request #776 from archtaku/develop
simplify MAC address example by using network.hwaddr instead of parsing ifconfig
2012-02-27 14:55:33 -08:00
Thomas S Hatch
321887c6b8 Merge pull request #775 from grierj/contribute
syndic_cmd malforms loads to 'glob' type
2012-02-27 14:54:47 -08:00
Erik Johnson
57d417fe41 simplify MAC address example by using network.hwaddr instead of parsing ifconfig with cmd.run 2012-02-27 16:51:04 -06:00
Grier Johnson
1e23211000 The upstream load has the key tgt_type and not expr_form, this makes for
malformed loads
2012-02-27 14:45:20 -08:00
Thomas S Hatch
2f065648a1 apply wtag checks to all cmd interfaces that need them 2012-02-27 15:44:49 -07:00
Thomas S Hatch
4d586e3f6c more concise exception catch 2012-02-27 15:34:06 -07:00
Thomas S Hatch
f6fd3cbd7a Add wtag checks to the client 2012-02-27 15:19:44 -07:00
Thomas S Hatch
34be8f2c4b Add wtag checks to master 2012-02-27 15:19:28 -07:00
Thomas S Hatch
2857276b18 Add passign master's id to syndic return 2012-02-27 15:15:02 -07:00
Thomas S Hatch
71c391d771 pidfile missing from cli struct 2012-02-27 14:01:40 -07:00
Thomas S Hatch
ece2c2771e Merge branch 'develop' of github.com:saltstack/salt into develop 2012-02-27 13:49:11 -07:00
Thomas S Hatch
a74c104785 Remove redundant code 2012-02-27 13:48:48 -07:00
Thomas S Hatch
dddeca0de3 Merge pull request #774 from fatbox/mysql-module
Fix mysql __virtual__ to correctly detect config
2012-02-27 07:50:15 -08:00
Thomas S Hatch
df6a8141c7 Merge branch 'basestring' of https://github.com/fatbox/salt into fatbox-basestring
Conflicts:
	salt/state.py
2012-02-27 08:48:03 -07:00
Evan Borgstrom
e6481b875f Fix mysql __virtual__ to correctly detect config
It looks like when the following commit[1] was made it broke the mysql
module, and I haven't noticed until now some how.

My guess is that __opts__ used to look like
__opts__['mysql']['default_file'] where as it now looks like
__opts__['mysql.default_file']

[1] = b7e7cc3cb1
2012-02-27 10:43:56 -05:00
Thomas S Hatch
cb6a9ac5bb Merge pull request #771 from pille/ubuntu-packaging
updated ubuntu install doc
2012-02-27 07:14:31 -08:00
pille
aa08f8a52b updated ubuntu install doc
currently there's no single up-to-date salt-package anymore.
it has been split into pieces. wrt #711.
2012-02-27 11:44:48 +01:00
Evan Borgstrom
15e0ff5483 When using isintance to detect strings we should check for basestring
I spent the past 30 min trying to debug a problem where when a command
was published to the minion it was arriving as a string instead of a
tuple. The cmd.run module was receiving:

    {
	'arg': 'mycommand myarg1 myarg2'
	'fun': 'cmd.run',
	'jid': '20120226160155389058',
	'ret': '',
	'tgt': 'mytarget'
    }

This was causing the following exception:

    TypeError: run() takes at most 3 arguments (20 given)

I traced this down to the publish module checking for an instance of
'str' and splitting on ','.

In my instance the problem was being caused because Django likes to use
Unicode strings everywhere and the isintance was returning False.

I've replaced all instances of str with basestring in all the isintance
checks.
2012-02-26 16:11:34 -05:00
Thomas S Hatch
43de62c855 fix issue where grains don't always load static config content 2012-02-26 10:22:52 -07:00
Thomas S Hatch
0ffdcfe931 Add deprecation tot he salt -Q option 2012-02-25 23:46:30 -07:00
Thomas S Hatch
a010ffa9f3 Add deprecation warning to manpage for salt -Q 2012-02-25 23:41:41 -07:00
Thomas S Hatch
d4d1e6a2fa fic docstring in rh_service module 2012-02-25 23:39:17 -07:00
Thomas S Hatch
e1bcb75a71 Add initial upstart support for Ubuntu 2012-02-25 23:37:48 -07:00
Thomas S Hatch
632336ffbb Add dynamic module loading doc 2012-02-25 23:19:09 -07:00
Thomas S Hatch
c1c7a24a9f Merge pull request #769 from UtahDave/develop
Basic Windows Registry management
2012-02-25 20:27:13 -08:00
David Boucha
a7251ba856 Basic Windows Registry management
Squashed commit of the following:

commit 6cf776ebbb7d742934a0ab2bd823fd360b8868ce
Author: David Boucha <boucha@gmail.com>
Date:   Sat Feb 25 20:30:36 2012 -0700

    Basic Windows Registry management completed

commit f18a2e99396bcc0154fc0a20be8800f166f5acb5
Author: David Boucha <boucha@gmail.com>
Date:   Sat Feb 25 17:34:54 2012 -0700

    Add reg.read_key

commit e8cecf96c31f9c2a545614a5a901c26125197887
Author: David Boucha <boucha@gmail.com>
Date:   Sat Feb 25 15:25:09 2012 -0700

    Add reg.py for managing Registry settings in Windows
2012-02-25 20:51:52 -07:00
Thomas S Hatch
3d342ecfa0 Merge pull request #767 from archtaku/develop
add recursive ownership management to file.directory
2012-02-25 17:47:02 -08:00
Erik Johnson
ef484d39aa add recursive ownership management to file.directory 2012-02-25 19:29:43 -06:00
Thomas S Hatch
e224a60388 Merge pull request #766 from uggedal/develop
More concise handling of extend members across states.
2012-02-25 16:43:21 -08:00
Eivind Uggedal
706b980e66 More concise handling of extend members across states. 2012-02-26 01:41:48 +01:00
Thomas S Hatch
e29eee2fe6 Merge pull request #765 from uggedal/develop
Fix bug where only the last extend across a highstate was realized.
2012-02-25 16:38:20 -08:00
Eivind Uggedal
17f2ac717d Fix bug where only the last extend across a highstate was realized. 2012-02-26 01:36:00 +01:00
Thomas S Hatch
69958807ad The shadow module != file 2012-02-25 17:00:48 -07:00
Thomas S Hatch
df4c8ed760 Add run_num to 0 sls file return 2012-02-25 15:15:05 -07:00
Thomas S Hatch
1211cfff34 Add openvz ps option 2012-02-25 15:00:40 -07:00
Seth House
f01a76546e Removed old grains doc from toctree
Should have been in 084f8a7.
2012-02-25 14:56:29 -07:00
Seth House
bca4c2ff12 Added document-level headings to platform-specific headings 2012-02-25 14:56:29 -07:00