Commit Graph

56 Commits

Author SHA1 Message Date
Colton Myers
9128e8e7ae Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/gce.py
    salt/modules/daemontools.py
2015-10-07 13:14:28 -06:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
2015-10-07 12:06:12 -06:00
Jacob Hammons
117e0c2bcc Added hardening topic based on the information in Refs #27088 2015-10-06 17:36:54 -06:00
Jacob Hammons
76dc8de71b Assorted doc bugs
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
2015-10-05 17:37:13 -06:00
Gary Wright
84b6ee0c58 .pub as public key is what we should send to remote 2015-10-05 11:40:55 -06:00
Gary Wright
00baf21176 .pub as public key is what we should send to remote 2015-10-03 23:01:19 +01:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
2015-09-29 18:13:33 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
Mike Place
5de2ee35ab Minor doc fixup.
Language and grammar changes.
2015-09-28 17:19:21 -06:00
ZhiFeng Hu
af656c7e87 Doc: copy key to server via ssh-copy-id
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-09-28 17:19:09 -06:00
Mike Place
a49cdab950 Minor doc fixup.
Language and grammar changes.
2015-09-28 13:11:58 -06:00
ZhiFeng Hu
58ea4550ba Doc: copy key to server via ssh-copy-id
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-09-26 22:55:00 +08:00
rallytime
08c04da48b Document tty: True usage in salt-ssh roster file
Fixes #27354
2015-09-24 16:25:22 -06:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
2015-09-03 14:24:45 -06:00
Colton Myers
1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/conf.py
    doc/topics/cloud/config.rst
    doc/topics/cloud/index.rst
    salt/modules/git.py
    salt/states/git.py
    salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
Jacob Hammons
0ec036350d Updates to salt-ssh and salt-key
#24510
2015-08-31 20:00:30 -06:00
Pedro Algarvio
92e0e90e98 Remove duplicate entry 2015-07-28 00:42:54 +01:00
Colton Myers
1d77ae9072 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/modules/hipchat.py
    salt/modules/random_org.py
    salt/modules/serverdensity_device.py
    salt/modules/slack_notify.py
    salt/returners/__init__.py
    salt/states/iptables.py
2015-05-11 11:38:03 -06:00
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Colton Myers
7729834d92 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    salt/client/ssh/wrapper/__init__.py
2015-05-06 15:45:11 -06:00
Justin Findlay
8074d16d52 2015.2 -> 2015.5
Related to https://github.com/saltstack/salt-windows-dev/pull/10.
2015-05-06 11:40:01 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
2015-05-05 16:26:39 -06:00
Colton Myers
c223309bb7 Add versionadded 2015-05-05 12:44:50 -06:00
Colton Myers
c273ea14c6 Add minion config to salt-ssh doc 2015-05-04 14:48:19 -06:00
Colton Myers
a0b6b760c3 Add minion_opts to roster docs 2015-05-04 14:46:16 -06:00
Carl Meyers
cdd940761f Update index.rst salt-ssh doc
Fixed typos and changed some wording.
2015-03-18 22:35:04 -07:00
Colton Myers
8363db9d29 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-01-13 12:09:56 -07:00
Colton Myers
2a6c9a8165 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	doc/topics/ssh/index.rst
2015-01-13 11:58:58 -07:00
David\ Beitey
839968f637 Expand documentation about Saltfile for salt-ssh 2015-01-13 16:50:29 +10:00
Thomas S Hatch
bc74de81c6 Merge branch 'develop' of https://github.com/aurynn/salt into aurynn-develop
Conflicts:
	doc/topics/ssh/roster.rst
2015-01-12 11:36:24 -07:00
Aurynn Shaw
e1dbd4c07e Removes spurious text 2015-01-12 13:55:44 +13:00
Aurynn Shaw
7e4f5639ec Updates Salt SSH roster documentation, adding thin_dir and a note on setting persistent grains 2015-01-12 13:54:30 +13: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
Henrik Holmboe
3f669c4b5d Update index.rst 2014-10-28 18:36:19 +01:00
Mike Place
36288eef7f Clarify doc 2014-10-16 16:09:57 -06:00
Thomas S Hatch
b5d92a4018 Salt ssh is no longer beta 2014-09-18 15:47:17 -06:00
Gajdos Tamás
d4dbaa77e0 Update documentation on salt-ssh
User must set NOPASSWD option for a non-root user to use sudo. 
Solves #12808.
2014-08-25 14:14:05 -06:00
Seth House
918f12a376 Added roster modules to the documentation 2014-06-30 14:01:48 -06:00
bVector
198859c44f Typo correction 2014-05-30 10:56:54 -07:00
Justin Carmony
e4c2cab1cc Updating docs for Saltfile 2014-05-07 19:53:27 -06:00
Chris Rebert
8af229253f more copyediting 2014-04-30 13:55:48 -07:00
Mike Place
cdd5d86bbf Clarify where the Salt SSH configuration comes from. 2014-03-11 11:59:07 -06:00
Thomas S Hatch
d8a7eab8e0 clean up first person speak 2014-02-17 14:52:38 -07:00
Leonids Maslovs
79150a84e0 saltstack/salt#9851 salt-ssh fileserver operations support warning
`salt-ssh` index page updated to contain warning note explaining what not
all `salt` commands are supported at the moment (especially file
operations)
2014-02-16 01:07:49 +02:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
2014-01-26 18:41:28 -08:00
Colton Myers
5e8a70123b Add alpha warning for salt-ssh 2013-11-22 13:58:06 -07:00
Diego Woitasen
2d1edf71da Document how to run salt-ssh as unprivileged user. 2013-11-03 05:35:21 -03:00
Dan Garthwaite
a48a8deec2 Added undocumented ssh roster configuration options 2013-10-11 10:21:52 -04:00
Colton Myers
10a7a638c8 Add note about salt-ssh package to salt-ssh docs 2013-10-03 17:18:03 -06:00
Cory Wright
67d11353c4 Fix typos 2013-10-03 14:51:49 -04:00