valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
56,532 Commits 24 Branches 182 Tags 341 MiB
ba15691abb
Commit Graph

56532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
dc9c9b5a34 Merge pull request #26079 from cachedout/issue_26039 
Update docs to remove state.over
 2015-08-06 17:35:26 -06:00
Nicole Thomas
b57adef8fc Merge pull request #26052 from jtand/rh_ip_fix 
Rh_ip fix
 2015-08-06 17:34:59 -06:00
Jeremy Rosenbaum
3381082d1c fix pylint error (unnecessary 'finally' clause may swallow exceptions unintentionally) 2015-08-06 17:30:32 -06:00
Jeremy Rosenbaum
0b2efdb049 Fix issue with mixed user and group eauth perms 
If an eauth config contained permissions for specific users and for groups,
a valid user that did not belong to any of the groups specified would have requests
fail because the validation logic assumed that if groups were configured for eauth,
any valid token would contain groups info, but the token creation logic only inserted
this information if the user matched one or more groups specified in the eauth config.

I also cleaned up a bunch of logic that fetched the same dictionary data repeatedly
and cycled through the same data multiple times.
 2015-08-06 17:30:32 -06:00
Jeremy Rosenbaum
e5d7be5e40 Return all relevant perms on login 
If the requesting user was in a group specified in the eauth config, then the return would only have
the permissions allowed by their group memberships, even if there were specific permissions for that user
or permissions for '*'.  A user without any group permissions, but with user-specific permissions would also
not get permissions for '*'.  Now, the return should contain all relevant permissions for the requesting user.
 2015-08-06 17:30:32 -06:00
Evgeny Vereshchagin
366ca02b22 Fetch a keyid ID from a fingerprint 
`apt-key del` works with IDs
`signing_key_fingerprint` contains a fingerprint
 2015-08-06 17:28:03 -06:00
Mike Place
a66f3eb8f1 Merge pull request #26078 from cachedout/issue_26040 
Fix missing key in error return
 2015-08-06 16:45:13 -06:00
twangboy
89d8faaeb1 Added python_shell=True, quoted user input 2015-08-06 16:44:13 -06:00
justinta89
aaede4a7a1 removed osmajorrelease key 2015-08-06 16:00:39 -06:00
Colton Myers
cb7b13e37b Merge pull request #26074 from basepi/revert.revert.25358 
[2015.8] Re-apply #25358 in 2015.8
 2015-08-06 15:49:58 -06:00
Mike Place
aeee91cd77 Move invocation routine up 2015-08-06 15:42:07 -06:00
Joseph Hall
8717a36963 Fix string checking in s3fs 2015-08-06 15:24:55 -06:00
Mike Place
f03f460af2 Update docs to remove state.over 
Closes #26039
 2015-08-06 15:24:39 -06:00
Mike Place
b3a6253b2c Fix missing key in error return 
Closes #26040
 2015-08-06 15:17:54 -06:00
Domingo Kiser
1ff67c3c22 Deep merge of pillar lists 2015-08-06 14:10:21 -06:00
Mike Place
aa023f25b8 Merge pull request #26058 from Unity-Technologies/hotfix/fix-choco-pkg-version-2015-5 
Fix choco version on chocolatey versions below 0.9.9
 2015-08-06 12:50:10 -06:00
Mike Place
fbe2584abe Merge pull request #26068 from jfindlay/auto_fix 
fix autoruns.list looking in wrong directory
 2015-08-06 12:49:48 -06:00
Mike Place
8f2e542b2b Merge pull request #26069 from jfindlay/win_fire 
fix win_firewall.delete_rule
 2015-08-06 12:49:28 -06:00
Justin Findlay
4ad8cabef4 fix win_firewall.delete_rule 2015-08-06 11:21:05 -06:00
Justin Findlay
1e9a850e23 fix autoruns.list looking in wrong directory 2015-08-06 11:19:08 -06:00
Justin Findlay
cdc9886e9d Merge pull request #26066 from s0undt3ch/hotfix/bootstrap-script-2015.8 
[2015.8] Update to latest bootstrap stable release v2015.06.08
 2015-08-06 11:10:28 -06:00
Justin Findlay
5570408597 Merge pull request #26065 from s0undt3ch/hotfix/bootstrap-script-2015.5 
[2015.5] Update to latest bootstrap stable release v2015.06.08
 2015-08-06 11:09:35 -06:00
Justin Findlay
83a1922196 Merge pull request #26061 from gmcwhistler/2015.5 
Patch for issue #25994
 2015-08-06 11:07:34 -06:00
Justin Findlay
3361c073a2 Merge pull request #26049 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-06 10:59:13 -06:00
Nicole Thomas
073fb2bdea Merge pull request #26064 from s0undt3ch/issues/26063-unknown-locale 
Don't stacktrace when trying to get the default locale.
 2015-08-06 10:11:05 -06:00
Pedro Algarvio
76c77eef33 Update to latest bootstrap stable release v2015.06.08 
* Fix python-requests installations for Ubuntu >= 14.04 LTS. saltstack/salt-bootstrap#631, saltstack/salt-bootstrap#632, saltstack/salt-bootstrap#633
* Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04
* Exit the git checkout directory before deleting it. Thanks Bret Fisher. saltstack/salt-bootstrap#634
* Use prefix /usr for centos git install. Thanks Stanislav B. saltstack/salt-bootstrap#638
* Drop Ubuntu EOL versions. All Ubuntu version before 12.04.
* Make sure python-dev is installed wheb trying to install tornado from PyPi. saltstack/salt-bootstrap#640
 2015-08-06 14:54:14 +01:00
Pedro Algarvio
a430a62b01 Update to latest bootstrap stable release v2015.06.08 
* Fix python-requests installations for Ubuntu >= 14.04 LTS. saltstack/salt-bootstrap#631, saltstack/salt-bootstrap#632, saltstack/salt-bootstrap#633
* Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04
* Exit the git checkout directory before deleting it. Thanks Bret Fisher. saltstack/salt-bootstrap#634
* Use prefix /usr for centos git install. Thanks Stanislav B. saltstack/salt-bootstrap#638
* Drop Ubuntu EOL versions. All Ubuntu version before 12.04.
* Make sure python-dev is installed wheb trying to install tornado from PyPi. saltstack/salt-bootstrap#640
 2015-08-06 14:52:19 +01:00
Pedro Algarvio
8c6ab78b1d Don't stacktrace when trying to get the default locale. 
Fixes #26063
 2015-08-06 14:02:45 +01:00
john zaitz
b9e89d0f2d Patch for issue #25994 
When the NamedTemporaryFile function is called it will through a
TypeError exception. This converts the pid to a string before
concatenating it to the ‘name’.
 2015-08-06 12:07:11 +02:00
Daniel Hobley
beddb96b2b Fix choco version on chocolatey versions below 0.9.9 2015-08-06 08:21:27 +02:00
jacobhammons
0f44761d6e Merge pull request #26048 from jacobhammons/win-downloads2 
Updated windows download links in the docs to https://repo.saltstack.com
 2015-08-05 16:59:50 -06:00
jacobhammons
4bd4bc41f2 Merge pull request #26047 from jacobhammons/win-downloads 
Updated windows download links in the docs to https://repo.saltstack.com
 2015-08-05 16:59:44 -06:00
justinta89
941910bdca Fixed a ValueError in rh_ip.py 2015-08-05 15:35:44 -06:00
Colton Myers
a4d4f8c5f8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/modules/layman.py
    salt/modules/win_system.py
 2015-08-05 15:30:04 -06:00
Jacob Hammons
75243b61cf Updated windows download links in the docs to https://repo.saltstack.com 2015-08-05 15:13:19 -06:00
Jacob Hammons
7c162d181c Updated windows download links in the docs to https://repo.saltstack.com 
Refs #25961
 2015-08-05 14:45:42 -06:00
Justin Findlay
fde2fb1386 Merge pull request #26026 from alprs/fix-httpasswd_test_result 
Fix httpasswd result false positive in test mode
 2015-08-05 13:54:07 -06:00
Thomas S Hatch
dedcadc37e Merge pull request #26044 from rallytime/fix-25616 
Make sure the key we're comparing is also lowercase
 2015-08-05 13:23:54 -06:00
Thomas S Hatch
f005bdfce6 Merge pull request #26042 from jfindlay/result 
fix test mode logic in state docs
 2015-08-05 13:23:06 -06:00
Thomas S Hatch
0ce62bafe5 Merge pull request #26037 from rallytime/bp-25489 
Back-port #25489 to 2015.8
 2015-08-05 13:22:50 -06:00
Thomas S Hatch
51ab6864b7 Merge pull request #26036 from nicholascapo/survey.hash_follow_out_flag 
survey.hash: Remove manually printed text
 2015-08-05 13:21:58 -06:00
rallytime
c2e3803810 Make sure the key we're comparing is also lowercase 
Fixes #25616
 2015-08-05 11:57:06 -06:00
Justin Findlay
a83059ca01 fix test mode logic in state docs 2015-08-05 11:29:56 -06:00
Dmitry Kuzmenko
68aad3bd97 Fixed lin error 2015-08-05 10:56:28 -06:00
Dmitry Kuzmenko
041da28fc4 Fix lint error 2015-08-05 10:56:27 -06:00
Dmitry Kuzmenko
190de6aa4d Added NotImplemented Satl Exception. 2015-08-05 10:56:27 -06:00
Dmitry Kuzmenko
f404d548a1 list_jobs_filter with local_cache performance update 
- avoid sorting by keeping sorted
- don't keep all in memory
 2015-08-05 10:56:27 -06:00
Dmitry Kuzmenko
bba6d40acf Added jobs.get_jobs_list with count and find_job filters. 2015-08-05 10:56:27 -06:00
Mike Place
6a4d18eba6 Merge pull request #26030 from Unity-Technologies/hotfix/fix-choco-pkg-version-2015-5 
Fix a bug in choco version that returned odd data
 2015-08-05 10:30:25 -06:00
Nicholas Capo
439ee9831c survey.hash: Remove manually printed text 
* survey.hash should output based on the --out flag
* --out=json prints valid json, etc
* Partially Fixes #24460
 2015-08-05 11:28:45 -05:00