Justin Findlay
b5e2cff028
doc.topics.eauth: clarify client_acl vs eauth
...
Fixes #30587 .
2016-01-25 14:32:34 -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)
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
Mike Place
3575cdab54
Eauth docs on LDAP and group support.
2014-03-21 14:40:38 -06:00
Mike Place
826bad4cfb
Merge conflict and rebase.
...
Conflicts:
doc/ref/renderers/index.rst
2014-02-26 13:32:08 -07:00
Mike Place
fa086eb5e5
Eauth index re-write for clarity.
2014-02-19 16:40:06 -07:00
Seth House
3bb46ee78f
Added note about not authenticating as root when using the PAM module
...
Closes #4046 , refs saltstack/halite#108 .
2013-12-23 20:26:18 -07:00
Joe Healy
45525b4b59
Doc fixes to remove errors and warnings
2013-12-01 18:29:16 +11:00
Seth House
f026e1977c
Added (very) basic docs on adding wheel/runner modules to eauth docs
2013-11-15 15:19:11 -07:00
Seth House
5add97e36b
Added cross-reference to the ACL docs
2013-11-15 15:19:11 -07:00
John Albietz
4c780b0525
added salt_token filename
2013-02-18 14:19:57 -08:00
David Lindquist
bb84b431ee
Fix typo: s/buy/by/
2013-01-08 17:27:30 -08:00
Seth House
5b0abf59eb
Added / updated targets for the acl and eauth docs
2012-11-16 11:21:51 -07:00
Seth House
25b7992052
Added target to the eauth doc
2012-11-16 11:12:47 -07:00
Thomas S Hatch
de59231013
Initial eauth docs
2012-10-09 19:02:59 -06:00
