Jens Rantil
53153277ce
Fix incorrect client ACL documentation
...
Tested this by setting up a local Vagrant instance using the following
procedure:
1. Made a fresh minion/master install (using salt-bootstrap) of version
2014.1.10.
2. Adding a `test.ping` ACL rule for the `vagrant` user.
3. Asserting that I couldn't execute `salt '*' test.ping'` as `vagrant`
user.
4. Applying `chmod 755 /var/cache/salt /var/cache/salt/master/jobs
/var/run/salt /var/run/salt/master`.
5. Verifying that `salt '*' test.ping'` now works.
Fixes #16318 .
2014-10-05 10:40:37 +02:00
Jeremy Rosenbaum
4668480dff
fixes inconsistent bar/baz variable name in state module example
2014-10-01 21:53:45 -07:00
Chris Rebert
5ec98a7c4f
fix typos in doc/ref/configuration/master.rst
2014-10-01 14:06:11 -07:00
Ryan Lane
9eacaf1832
Add a use_master_when_local option to allow remote execution while using a local file_client
2014-09-28 18:53:43 -07:00
KennethWilke
0a4f3ad098
corrected master jobs path in clientacl doc
2014-09-25 16:07:28 -05:00
Thomas S Hatch
3ce955c774
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/deploy/bootstrap-salt.sh
2014-09-24 12:46:37 -06:00
Erik Johnson
a4413bb27a
Improve formatting
...
Bullet points look better here than an indented section with an enormous
font.
2014-09-23 20:58:26 -05:00
Thomas S Hatch
3f82e3664a
Merge branch '2014.7' into develop
2014-09-23 14:41:58 -06:00
rallytime
872b312770
Clarify unless and onlyif docs
2014-09-22 16:03:04 -06:00
vs
94948047cf
add rotate_aes_key documentation to master-configuration reference
2014-09-22 14:43:59 -06:00
Colton Myers
99e97320e1
Merge branch '2014.7' into develop
...
Conflicts:
doc/ref/configuration/minion.rst
doc/ref/states/requisites.rst
doc/topics/troubleshooting/master.rst
doc/topics/tutorials/index.rst
doc/topics/tutorials/intro_scale.rst
salt/config.py
salt/key.py
salt/master.py
salt/minion.py
salt/modules/file.py
salt/modules/hashutil.py
salt/modules/lxc.py
salt/modules/oracle.py
salt/modules/tls.py
salt/modules/win_update.py
salt/pillar/pepa.py
salt/pillar/s3.py
salt/states/augeas.py
salt/states/win_update.py
salt/tops/ext_nodes.py
salt/utils/master.py
2014-09-22 14:22:54 -06:00
Thomas S Hatch
f331d977d5
Merge pull request #15938 from babilen/doc/req_indent
...
Fix indentation errors and inconsistencies
2014-09-19 09:42:00 -06:00
Thomas S Hatch
d88ceab872
Merge pull request #15917 from felskrone/fix_key_rotation
...
Rename key_no_rotate to rotate_aes_key
2014-09-18 14:14:18 -06:00
Wolodja Wentland
3925df10d3
Fix indentation errors and inconsistencies
...
Documentation for new requirements did not consistently use two spaces for
indentation or even no indentation at all.
2014-09-18 21:02:56 +02:00
vs
ae07fe381b
add documentation for the con_cache setting in master config
2014-09-18 14:26:49 +02:00
vs
da78c38b97
add rotate_aes_key documentation to master-configuration reference
2014-09-18 13:57:38 +02:00
Erik Johnson
f47dd063e3
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
f056c9c3fa
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
132bdb78ee
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
70f10cb13e
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
13cc497b36
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Nitin Madhok
197df512bb
Doc fixes
2014-09-16 09:54:52 -04:00
Colton Myers
8d0bf0ee95
Merge branch '2014.7' into develop
...
Conflicts:
salt/states/pip_state.py
2014-09-15 11:49:04 -06:00
Seth House
978931c470
Added salt-unity manpages
...
Closes #13937
2014-09-13 12:56:25 -06:00
Thomas S Hatch
d6e3e01c6d
Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules
...
F/add syslog ng modules
2014-09-12 10:37:02 -06:00
Thomas S Hatch
cd7c31df7f
Merge pull request #15691 from mickep76/develop
...
Added reference to Pepa doc. and in-line rst documentation
2014-09-11 23:12:55 -06:00
loz-hurst
9031ea871a
Fix broken back ticks in 68301c4
2014-09-11 16:15:35 +01:00
Jille Timmermans
a8e3586aa1
Some textual fixes
2014-09-11 14:45:44 +02:00
Michael Persson
5a3ddc3201
Add documentation link for Pepa
2014-09-11 10:30:17 +02:00
loz-hurst
68301c4339
Updated module documentation for clarification
...
Added note to say that __salt__ is not available to __virtual__. Also added link to 'at.py' as an example, since it demonstrates using salt.utils in __virtual__ which the existing examples do not. Tweaked wording to make clear that not all the examples are package managers any more.
2014-09-10 14:35:40 +01:00
Colton Myers
bb24131750
Merge branch '2014.7' into develop
2014-09-05 11:57:57 -06:00
Thomas S Hatch
71c9bf4708
Add docs for roster_file option
2014-09-05 11:55:11 -06: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
Nitin Madhok
0e61c4125d
Fixing sphinx violation and warning
2014-09-03 15:22:26 -04:00
Erik Johnson
510942d3ec
Remove references to masterless salt from gitfs docs
...
Alternate backends do not yet work with the local fileclient.
2014-09-02 15:59:05 -05:00
Mike Place
be60e25574
Merge branch '2014.7' into develop
2014-09-02 13:56:54 -06:00
Erik Johnson
ed631d69b5
Add fileserver_backend param to minion config documentation
...
Also correct an incorrect rst link target for hash_type
2014-09-02 14:36:35 -05:00
Erik Johnson
a3c62ef119
Add default value for fileserver_backend
2014-09-02 14:35:03 -05:00
Erik Johnson
6e98ef828d
gitfs_provider has no default value
2014-09-02 13:22:47 -05:00
Thomas S Hatch
39b107a283
Merge pull request #14820 from steverweber/add_conf_help
...
show_timeouts, new default
2014-09-02 12:13:31 -06:00
Scott Coil
6770ce314e
add ability to target pillar from ext pillar
2014-08-31 16:46:22 -05:00
Colton Myers
c12f05f83a
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/aptpkg.py
salt/modules/tls.py
salt/states/boto_asg.py
salt/states/boto_secgroup.py
2014-08-29 16:27:00 -06:00
btibi
69b0deacf6
syslog_ng: add syslog-ng state and execution modules
2014-08-29 23:20:25 +02:00
Mike Place
b2dfdd497f
Add failhard to minion conf doc
...
Refs #15371
2014-08-29 09:39:28 -06:00
rallytime
cfcfb4bdac
Change --list-profiles to accept an argument such as "linode" or "all"
2014-08-26 08:03:39 -06:00
rallytime
0f4f68eddf
Add --list-providers and --list-profiles to cloud docs
2014-08-26 00:18:57 -06:00
Ryan Lane
8048b01562
Initial commit of boto_cloudwatch module and boto_cloudwatch_alarm state
2014-08-25 13:37:47 -06:00
Thomas S Hatch
317ec24ccc
Merge pull request #15176 from jgillich/patch-1
...
remove example duplicate
2014-08-22 14:15:46 -06:00
Chris Rebert
a53ae15d23
copyedits
2014-08-22 11:59:13 -07:00
Jakob Gillich
0112f70d9c
remove example duplicate
2014-08-22 16:06:09 +02:00