Commit Graph

12036 Commits

Author SHA1 Message Date
Thomas S Hatch
9ea128050e Last time I edit on github directly 2013-04-05 12:46:08 -06:00
Thomas S Hatch
1af88122ed Add code_block decs 2013-04-05 12:45:12 -06:00
Thomas S Hatch
5e8ec2c9a7 Add indent style stuff 2013-04-05 12:43:00 -06:00
Thomas S Hatch
09a2d5121b Merge pull request #4393 from giantlock/develop
fix unit tests
2013-04-05 08:51:32 -07:00
Thomas S Hatch
f2be57ac4f Merge pull request #4391 from torhve/develop
Improve nested outputter to check all number types
2013-04-05 08:40:45 -07:00
Thomas S Hatch
cb82d7307c Fix issue with MasterExit being in salt.master.py 2013-04-05 09:23:22 -06:00
Thomas S Hatch
7858dc8c16 Merge pull request #4387 from terminalmage/issue4295
Use __context__ to reduce calls to chkconfig/runlevel
2013-04-05 08:17:00 -07:00
Thomas S Hatch
2ebda8f820 Merge pull request #4386 from terminalmage/issue4383
Make user.info return an empty dict when user not present
2013-04-05 08:16:00 -07:00
Thomas S Hatch
e4fce9a576 Merge pull request #4392 from whiskybar/patch-1
fixed a typo
2013-04-05 07:53:59 -07:00
Denis Generalov
2511d2bb28 Merge branch 'develop' of github.com:giantlock/salt into develop 2013-04-05 18:22:07 +04:00
Denis Generalov
1b1a5bd743 fix unit tests 2013-04-05 18:21:33 +04:00
Denis Generalov
ed1dde4128 fix unit tests 2013-04-05 17:59:29 +04:00
Joseph Hall
ead7e4a77b Merge pull request #4388 from giantlock/develop
fix pgpassfile removing
2013-04-05 06:12:42 -07:00
Jiri Barton
6332202036 fixed a typo
a typo with consequences clearly
2013-04-05 15:04:06 +03:00
Tor Hveem
af7e3d2211 Improve nested outputter to check all number types 2013-04-05 13:54:48 +02:00
Denis Generalov
bd5bf09cac Merge branch 'develop' of https://github.com/saltstack/salt into develop 2013-04-05 10:00:57 +04:00
Erik Johnson
4ea667a105 Use __context__ to reduce calls to chkconfig/runlevel
This commit uses the __context__ dict to keep
salt.modules.rh_service._services() from running chkconfig --list and
runlevel every time it is called (which is often). The service.running
and service.dead states will clear the context data before trying to
detect changes.

This fixes #4295.
2013-04-04 23:36:22 -05:00
Erik Johnson
fd5ccb3ad0 Update refs to user.info
In 266b86a, user.info was changed in all the user providers to return an
empty dict if the user passed to it was not present. This commit updates
the refs in salt.modules.ssh so that they use dict.get (or check if the
return data from user.info resolves to False) where appropriate.

There are a few remaining refs in salt.states.user.present, but in all
of those remaining cases the user.info function is only run in instances
where the user already exists.
2013-04-04 22:51:02 -05:00
Erik Johnson
266b86a492 Make user.info return {} if user not present
This change has been made in all four user providers.
2013-04-04 22:30:30 -05:00
Thomas S Hatch
6b944f05cf Merge pull request #4385 from giantlock/7def5edf630e04b886aeaa93cf0867a42e83717e
Some fixes for postgres module
2013-04-04 17:28:13 -07:00
Thomas S Hatch
a4863e0d1d kill stray print 2013-04-04 18:21:15 -06:00
Thomas S Hatch
739056eac1 Ref the local client instance when gathering event data 2013-04-04 18:20:07 -06:00
Thomas S Hatch
6d9d00c44c Make gen_event get ful returns 2013-04-04 18:18:58 -06:00
Denis Generalov
4d4f6f4b30 do remove PGPASSFILE only when password is set 2013-04-05 04:03:01 +04:00
Denis Generalov
42278618e5 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2013-04-05 03:57:33 +04:00
Thomas S Hatch
6540636d87 This breaks the syndic, but fixes the tests
This also adds the code needed to get the syndic going again.
2013-04-04 17:52:52 -06:00
Denis Generalov
7def5edf63 * fix bug in _run_psql() with password handling
* use password through PGPASSFILE file
* fix checking maintenance_db and runas params: '' and None is equal
* fix bug with escaping in psql_query(), hope default delemiter and quote is enough
* psql_query() now returns list instead of dict, just according table nature
* add gathering tablespace parameter of databases in db_list()
* remove `locale` argument of db_create(), which is probably obsolete
* add db_alter() function for changing db parameters
* present() state now tries to fix db params if it's needed and possible
  (what we disscussed in issue #4164)
* fix pep8, formatting and double quotes
2013-04-05 03:40:35 +04:00
Thomas S Hatch
f05aff899a Merge pull request #4382 from basepi/userfix
Fix user.info to always return a list
2013-04-04 15:56:58 -07:00
Colton Myers
862499073d Fix user.info to always return a list 2013-04-04 16:56:06 -06:00
Thomas S Hatch
c009b08dfb Merge pull request #4380 from memotype/develop
fix debian/control to use python2.6
2013-04-04 14:56:17 -07:00
Thomas S Hatch
7902728562 Merge pull request #4379 from basepi/maxdepth2788
Add maxdepth parameter to file.recurse state
2013-04-04 14:54:30 -07:00
Isaac Freeman
247a8c183d fix debian/control to use python2.6 2013-04-04 16:35:16 -04:00
Colton Myers
7cf40b8973 Remove unnecessary comment, PEP8 fix 2013-04-04 14:09:37 -06:00
Colton Myers
064d18e0cf Add maxdepth to file.recurse (fixes #2788) 2013-04-04 13:52:06 -06:00
Thomas S Hatch
120b4a08d9 Merge pull request #4374 from spacedentist/develop
salt.modules.postgres: handle empty passwords correctly
2013-04-04 08:33:28 -07:00
Thomas S Hatch
54d88a4d3f Merge pull request #4372 from terminalmage/issue4336
Properly detect changes to groups made by user states
2013-04-04 08:26:06 -07:00
Sven Over
843c2cc9f9 salt.modules.postgres: handle empty passwords correctly
The 'password' and 'rolepassword' variables should not be evaluated as
booleans, as this will treat empty passwords as password not given.
2013-04-04 12:27:58 +02:00
Erik Johnson
169839888c Add __context__ support for group.getent
This commit adds the same __context__ support present in groupadd.py to
the following providers: pw_group.py, solaris_group.py, win_groupadd.py
2013-04-04 00:54:59 -05:00
Erik Johnson
38f17c6042 groupadd.py: normalize context variable name for group.getent 2013-04-04 00:54:12 -05:00
Erik Johnson
3005c8d082 Normalize context data for user providers
This commit makes all user modules use __context__ in the same place,
and have the context variables be named the same. This is so that the
user state can clear the context data, allowing it to be able to tell
what has changed.

Additionally, this commit also reverts some changes that I made a couple
week ago. I was looking for a less wasteful way to get user data for a
given user, and the user state was running user.getent and then looping
through the list of user info dicts. I added some code to the various
user.getent providers at that time that allowed getent to optionally
return the info for a single user. It turns out, the user providers
already have a function that does this: user.info. The user state has
been updated to call user.info rather than user.getent, and the
additional logic that was added to the getent functions in a558d84,
449b1e2, 44ec713, and 031f8f6 has been removed.
2013-04-04 00:46:29 -05:00
Joseph Hall
d24554db1b Merge pull request #4371 from timhollinger/develop
Improved readability, small grammar changes
2013-04-03 18:13:38 -07:00
Tim Hollinger
f13aedfc2b Improved readability, small grammar changes
swapped 'a' for 'an' where appropriate, fixed gramatical errors,
corrected verb agreement
2013-04-03 18:29:05 -06:00
Thomas S Hatch
5c2cb3fcd6 Merge pull request #4369 from tonthon/develop
Fix #4361 : pip's requirements option is partially broken in 0.14
2013-04-03 14:55:41 -07:00
G.Tjebbes
ba85257439 Fix #4361 : requirements option is broken
Add the requirements also when providing local requirement file
2013-04-03 23:43:42 +02:00
G.Tjebbes
60af610e3f Ref #4361 : add some unit tests on pip's args 2013-04-03 23:41:17 +02:00
Thomas S Hatch
8009e7a910 Merge pull request #4367 from giantlock/develop
some fixes for cmd module
2013-04-03 14:18:58 -07:00
Denis Generalov
952785733b * fix bug: cmd._run does not care about env argument when runas is passed
* fix bug: unable to set pass env param through command line
* fix bug: if runas set and shell rc files (.bashrc, .profile, etc) contain
  something that make stdout output env gathering fails
* fix bug (FreeBSD specific): su -s key has different meening (not about shell)
2013-04-04 01:04:43 +04:00
Thomas S Hatch
819f8f9cc9 Merge pull request #4366 from aberant/patch-1
Update rvm.py
2013-04-03 13:23:53 -07:00
colin harris
09fa4c35a1 Update rvm.py
there is a bug in the code that causes _rvm to return False when rvm is not installed on the root account.
this commit passes runas to is_installed so it queries the correct user
2013-04-03 14:54:00 -05:00
Thomas S Hatch
58febaaeb2 Merge pull request #4365 from UtahDave/puppet_dirs
Fixes Puppet Enterprise dirs
2013-04-03 12:50:43 -07:00