valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,567 Commits 24 Branches 182 Tags 341 MiB
b14e4f9919
Commit Graph

15567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
5450e721c6 Add build_rule function to iptables execution module 2013-07-10 14:11:30 -06:00
Joseph Hall
da612b59b1 Add function to check for the existance of an iptables rule 2013-07-10 13:25:57 -06:00
Joseph Hall
a8127c4ae1 Merge pull request #6093 from terminalmage/issue6070 
Cleanup unused arguments
 2013-07-10 12:14:10 -07:00
Erik Johnson
e0bf5309c6 Cleanup unused arguments 
This commit cleans up some unused arguments in user and group
management, storing them in **kwargs. Warnings are logged when the
arguments are used. Fixes #6070.
 2013-07-10 14:08:21 -05:00
David Boucha
500d1d8b73 Merge pull request #6092 from UtahDave/develop 
Clarify that event is sent up to the master
 2013-07-10 11:55:22 -07:00
David Boucha
89f8d0ebe0 Clarify that event is sent up to the master 2013-07-10 12:53:50 -06:00
Joseph Hall
73e08f792c Merge pull request #6091 from terminalmage/issue6085 
Allow user to set password to default hash
 2013-07-10 11:22:48 -07:00
Erik Johnson
875e25231d Rename 'pwd' field in windows shadow.info output 
This makes the field name consistent with the other shadow modules. Note
that the passwd field is not used at all in Windows user management, so
this is merely a cosmetic change.
 2013-07-10 13:12:29 -05:00
Erik Johnson
6b177ebac7 docstring grammar fix 2013-07-10 13:12:21 -05:00
Erik Johnson
b948f028b3 Allow user to set password to default hash 
The passwd field in the output from shadow.info was normalized in
508d816 and 6239136 to make it easier for states to manage users, but
this prevents users from setting the password to the default password
hash. This commit fixes that regression.
 2013-07-10 13:12:11 -05:00
Colton Myers
2d7dc6051d Merge pull request #6080 from jspc/no_fstab_failed_mount 
No fstab change for failed mount
 2013-07-10 10:25:44 -07:00
Joseph Hall
3ab7bf8900 Merge pull request #6089 from jacksontj/develop 
Update pillar topic docs to match what it does
 2013-07-10 08:38:36 -07:00
Thomas Jackson
c1243d6393 Update pillar topic docs to match what it does 
#6084
 2013-07-10 08:19:46 -07:00
jspc
0c9bcab355 Worthless booleans removal 2013-07-10 10:27:09 +01:00
jspc
bb10e8cee2 Ignore emacsen files 2013-07-10 10:27:04 +01:00
jspc
454e19d023 Don't touch fstab if the mount fails 2013-07-10 10:26:38 +01:00
Stephen Edie
1b49625c1a refactor rh_service.py for clarity, efficiency, and correctness 2013-07-09 19:54:39 -06:00
Joseph Hall
74a834d848 Merge pull request #6073 from shadowfax-chc/portage_config_cleanup 
Portage config cleanup
 2013-07-09 17:18:46 -07:00
Oleg Anashkin
1f8b60f933 Install setuptools instead of distribute 2013-07-09 16:58:39 -07:00
shadowfax-chc
33f4c7f566 Fixed portage_config state to allow a return of True 
portage_config state was always returning None when Test=True.
 2013-07-09 19:30:56 -04:00
Chris Rebert
5524d54d0c SaltLoggingClass: Pass __init__ args thru to superclass' __new__ 
************* Module salt.log
W0613:153,21:SaltLoggingClass.__new__: Unused argument 'logger_name'
 2013-07-09 15:26:15 -07:00
Pedro Algarvio
a8e8486144 Merge pull request #6069 from hulu/ddns 
ddns module: fix pylint warnings & docstring typo
 2013-07-09 15:13:51 -07:00
Thomas S Hatch
a61699f306 fix init call in inherited class with inheritence change 2013-07-09 16:11:43 -06:00
Chris Rebert
135af8a96f ddns module: fix pylint warnings & docstring typo 2013-07-09 15:01:40 -07:00
Joseph Hall
9de41fc5a7 Merge pull request #6068 from terminalmage/issue5131 
Fix ignored arguments in FreeBSD, Solaris user modules
 2013-07-09 14:25:42 -07:00
Erik Johnson
d6753328fd Note where "force" option to user.absent not supported 2013-07-09 16:18:59 -05:00
Erik Johnson
b4efe30aa9 Log an error when unsupported option used (solaris_user) 2013-07-09 16:18:11 -05:00
Erik Johnson
3fa7f542cd Implement "unique" option in pw_user 
Also log an error if "force" option is submitted to the del() function.
 2013-07-09 16:16:30 -05:00
shadowfax-chc
c7f1e88ac0 Reworked imports. 
Prevents loaded modules printing doc info.
 2013-07-09 17:01:58 -04:00
Matthew Williams
7c1eccf8cd omapi: doc fix 2013-07-09 20:02:26 +00:00
Matthew Williams
e16d6f7c35 Merge remote-tracking branch 'origin/develop' into ddns 2013-07-09 19:52:29 +00:00
Thomas S Hatch
52cb30a266 Merge pull request #6065 from kadel/patch-1 
fix broken links on 'Modular System' page
 2013-07-09 12:52:12 -07:00
Matthew Williams
2f93c5069b add omapi execution module for making dhcp server updates 2013-07-09 19:51:49 +00:00
Thomas S Hatch
6d9cde5ab1 Merge pull request #6066 from terminalmage/issue6052 
Don't try to load git_pillar if not enabled in master config
 2013-07-09 12:51:42 -07:00
Erik Johnson
29fbdb028b Change gitpython to GitPython 
Use the proper capitalization of GitPython.
 2013-07-09 12:47:59 -05:00
Erik Johnson
4f62116c10 Correct innacuracy in log message 
This log entry was apparently copied directly from the git fileserver
backend, but this isn't the git fileserver backend, it's the git
external pillar.
 2013-07-09 12:47:06 -05:00
Erik Johnson
4225337e22 Don't try to load git_pillar if not enabled in master config 
This fixes #6052 by doing a check for git-based external pillars in the
master config, and returning False when there are none. This suppresses
an error later on in the __virtual__() function which complains that the
git fileserver backend is configured (when it clearly is not).
 2013-07-09 12:45:14 -05:00
Tomas Kral
744549da55 fix broken links on 'Modular System' page 2013-07-09 19:10:12 +02:00
David Boucha
e70c9188c2 Merge pull request #6062 from basepi/yamlidio 
Add underscore stripping to YAML idiosyncrasies docs
 2013-07-09 09:55:48 -07:00
David Boucha
ad1413dfdc Merge pull request #6061 from Singletoned/develop 
Renamed git-python to gitpython
 2013-07-09 09:50:55 -07:00
Joseph Hall
1532939fb0 Merge pull request #6063 from basepi/keyregendoc 
Add 60 second window to key_regen docs
 2013-07-09 09:49:09 -07:00
Colton Myers
c499da0d93 Add 60 second window to key_regen docs 2013-07-09 10:45:08 -06:00
Joseph Hall
a71fcc7194 Merge pull request #6054 from mgwilliams/ddns 
Execution and state modules for RFC 2136 dynamic DNS updates.
 2013-07-09 09:13:57 -07:00
Colton Myers
57bd942725 Remove trailing whitespace 2013-07-09 10:12:38 -06:00
Colton Myers
1b9f3ff21c Add underscore stripping to YAML idiosyncrasies 2013-07-09 10:11:43 -06:00
Ed Singleton
9d8f8e41e8 Renamed git-python to gitpython 2013-07-09 14:54:22 +01:00
Pedro Algarvio
72278e12e4 Merge pull request #6058 from terminalmage/docs 
Clarify docs on custom types
 2013-07-09 04:48:25 -07:00
Pedro Algarvio
6078bd0f50 Merge pull request #6055 from cvrebert/patch-1 
ssh/shell.py: fix typos in comments
 2013-07-09 04:43:00 -07:00
Pedro Algarvio
292c43afb1 Merge pull request #6059 from terminalmage/issue6053 
Fix return statement in supervisord.running state
 2013-07-09 02:53:02 -07:00
Erik Johnson
cadd842ed2 Fix return statement in supervisord.running state 
When test=True is used, this state builts the return dict, and then runs
"return" instead of returning the dict, causing a traceback. This commit
fixes #6053 by fixing that return statement.
 2013-07-08 21:51:29 -05:00