valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
93,219 Commits 24 Branches 182 Tags 341 MiB
20048c6fca
Commit Graph

62 Commits

Author SHA1 Message Date
rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/modules/pip.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/runners/manage.py
  - salt/states/pkg.py
  - salt/transport/zeromq.py
  - salt/utils/event.py
  - tests/integration/modules/test_pip.py
  - tests/integration/states/test_user.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_archive.py
  - tests/unit/utils/test_boto.py
 2018-01-23 13:26:43 -05:00
Dmitry Kuzmenko
f33ebcada0
Doc note about user names regex matching in pub acl and eauth. 2018-01-17 17:49:19 +03:00
Dmitry Kuzmenko
e29c0ff19e
Docs update for function args limit in pub acl. 2018-01-16 23:02:28 +03:00
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop' 
Conflicts:
  - doc/topics/tutorials/index.rst
  - salt/crypt.py
  - salt/modules/cmdmod.py
  - salt/modules/grains.py
  - salt/pillar/git_pillar.py
  - salt/roster/clustershell.py
  - tests/unit/states/test_augeas.py
  - tests/unit/utils/test_utils.py
 2017-10-16 15:26:19 -04:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-10-10 16:34:52 -04:00
C. R. Oldham
962a20cf4b
Require that bindpw be non-empty if auth.ldap.anonymous=False 2017-10-06 15:41:07 -06:00
Dmitry Kuzmenko
7ec398eb72 Allow external_auth limit funs/args for runner/wheel modules. 
Example:
external_auth:
  pam:
    thatch:
      - '@runner':
        - 'mod.fun':
          args: ['a', 'b']
          kwargs:
            aa: bb
 2017-08-22 12:17:09 +03:00
C. R. Oldham
16a05a5554 Fix backticks and dropped clause. 2017-06-19 14:03:34 -06:00
C. R. Oldham
a6025c3c66 Clarify some LDAP issues driven by #38259 and #38293 2017-06-19 12:46:28 -06:00
Inveracity
f1c6fc30d1 include option for freeipa 
Updating docs to include freeipa per merge request #37219
 2017-01-02 14:15:42 +01:00
Clint Armstrong
928462df1d fix example of function argument limiting (#37584) 2016-11-09 13:37:18 -07:00
Seth House
b6ebd7b6ef Add docs for arg/kwarg eauth matching 
This adds documentation for the addition in #29153.
 2016-06-09 09:13:02 -06:00
C. R. Oldham
aed0f07349 Strip ldap fqdn (#33127) 
* Add option to strip off domain names on computer names that come from LDAP/AD

* Add strip_domains option for ldap.

* Add documentation for auth.ldap.minion_stripdomains.
 2016-05-10 14:42:19 -07:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Justin Findlay
b5e2cff028 doc.topics.eauth: clarify client_acl vs eauth 
Fixes #30587.
 2016-01-25 14:32:34 -07:00
Theodore Cowan
aa80bd2700 Update index.rst 
Inform user that state module runs will return "Failed to authenticate!" when the timeout is reached.  This should be fixed btw.
 2015-12-28 10:47:40 -07:00
SaltyCharles
e36d1cebc5 Update index.rst 
fix typo's and grammar
 2015-10-28 15:43:47 -07:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
Jacob Hammons
499bd66378 Minor doc bug fixes 
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
 2015-08-19 11:31:26 -06:00
Colton Myers
1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    conf/minion
    salt/client/__init__.py
    salt/states/dockerio.py
    salt/utils/event.py
    tests/unit/utils/event_test.py
 2015-08-11 18:12:21 -06:00
C. R. Oldham
79833e3f8a Cherry pick index.rst change. 2015-08-10 10:59:16 -06:00
C. R. Oldham
99f2c27399 Documentation update for anonymous bind issue. 2015-08-10 10:58:29 -06:00
Colton Myers
f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
 2015-08-03 14:50:50 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes 
Refs #24042
Refs #25650
Refs #21296
Refs #23788
 2015-07-30 14:39:15 -06:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
 2015-07-08 16:24:58 -06:00
David Boucha
65abb63003 remove some extraneous double spaces 2015-07-06 10:48:04 -06:00
David Boucha
c423b62aa5 fix misspelling 2015-07-06 10:46:18 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
rallytime
70028553c1 yaml indentations should be 2 spaces 2015-06-05 11:21:26 -06:00
Arthur Lutz
21b51abf25 [doc] Alignement fix on external_auth documentation 2015-06-05 11:20:00 -06:00
Arthur Lutz
24502e2655 [doc] Alignement fix on external_auth documentation 2015-06-05 12:32:21 +02:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
 2015-03-30 15:10:17 -06:00
C. R. Oldham
2eb6d26995 Add authentication against Active Directory 2015-03-25 13:01:37 -06:00
C. R. Oldham
7421042dd2 Add authentication against Active Directory 2015-03-25 12:49:35 -06:00
Preston Marshall
05d06a5d09 Add note about ldap module requirement 
Currently the only way you can figure out that you need the LDAP module is to read the source. I assumed it was installed as part of my OS package, but it is not. This documents it clearly that you need to install the module.
 2015-03-18 14:32:15 -05:00
Boris Feld
e97a34cae2 Update salt_token name 
salt_token seems to be now saved as ~/salt_token by default (a52ebdac3b/salt/config.py (L2192)), update the documentation about default salt-token save path
 2015-03-04 11:52:51 +01:00
twellspring
7ac3a18d08 Note eAuth PAM requires root salt-master 
Using eAuth with PAM external authentication module requires salt-master to be run as root
 2015-02-16 07:57:24 -08:00
Thomas Jackson
498a612078 Whitespace cleanup 
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
 2014-12-11 07:53:19 -08:00
Aditya Kulkarni
e19550763b Accept salt token for cherrypy /events 2014-12-05 12:15:23 -05:00
Thomas S Hatch
9ec90bafea Merge branch '2014.7' into develop 
Conflicts:
	salt/output/__init__.py
 2014-10-13 17:41:42 -06:00
Thomas Jackson
e60f47052e Update ACL docs to include @jobs markup 2014-10-13 16:13:23 -07:00
Thomas S Hatch
2f6ae96f37 Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
 2014-09-03 14:43:07 -06:00
Mike Place
350b6f853a Typo 2014-09-02 16:19:59 -06:00
Mike Place
3075b1fd33 Clarify a point about runners and eauth 2014-09-02 15:56:25 -06:00
Nitin Madhok
913057254d Fixing typo 2014-08-26 13:30:06 -04:00
Nitin Madhok
0208baa53c Fixing some of the formatting issues 2014-08-25 13:32:15 -04:00
Mike Place
a3d57b56a2 Fix eauth docs. 
Refs #12111
 2014-05-05 10:56:13 -06:00
Chris Rebert
8af229253f more copyediting 2014-04-30 13:55:48 -07:00
Erik Johnson
18bb7147a4 Fix RST syntax errors 2014-03-24 11:12:56 -05:00