Thomas S Hatch
8f92b6b2cb
Add untaring the thin tarball into the shim
...
Also add hooks in to checksum the thin tarball
2013-10-12 11:07:34 -06:00
Thomas S Hatch
aa4bb77ef2
The .salt directory should be owned by the ssh login user
...
Since the ssh login user is used to drop the deployment file they need
write permissions, and since the login user can sudo they have rights to
manage the salt runs. When salt runs as root it will still have access
to said files.
We still need more validation around the integrety of the passed files
2013-10-12 09:57:48 -06:00
Thomas S Hatch
c33049d438
restore the cmd_block deploy seq
2013-10-12 09:44:48 -06:00
Thomas S Hatch
838df9f653
don't bail out on per errros, they are not from the shim
2013-10-12 09:08:01 -06:00
Thomas S Hatch
3c59e9f881
Fix two bugs:
...
1) ssh-copy-id is a bit of a pill, fall back to try the multiple
formats suppoerted by ssh-copy-id
2) Escaping the heredoc causes it to fail, we need to find a better
way to only escape if it is a raw command
2013-10-12 09:06:48 -06:00
Thomas S Hatch
99dff2e3f3
Merge pull request #7785 from shadowfax-chc/hgfs-events
...
Added events for hgfs. Closes #7778
2013-10-12 07:49:54 -07:00
Thomas S Hatch
1e3f197726
Merge pull request #7787 from techhat/cmdinjection
...
Sanitize inputs for bluetooth functions
2013-10-12 07:48:18 -07:00
Thomas S Hatch
1a5783ba84
Merge pull request #7784 from drawsmcgraw/develop
...
Added an example for the 'use' requisite.
2013-10-12 07:47:47 -07:00
Joseph Hall
07972eb0a6
Sanitize inputs for bluetooth functions
2013-10-12 07:15:04 -06:00
shadowfax-chc
4561a80a8d
Added events for hgfs. Closes #7778
2013-10-12 00:48:26 -04:00
drawsmcgraw
5e765ad837
Added an example for the 'use' requisite.
2013-10-12 00:31:58 -04:00
Thomas S Hatch
c60883a0f4
Merge pull request #7769 from s0undt3ch/features/i18n-documentation
...
Add support for other documentation languages.
2013-10-11 19:59:36 -07:00
Thomas S Hatch
0c599d773d
Merge pull request #7782 from davidjb/develop
...
Fix minor typo in state logging
2013-10-11 19:57:51 -07:00
Thomas S Hatch
b73677435b
Merge pull request #7779 from techhat/cmdinjection
...
Condense df sanitization
2013-10-11 19:57:22 -07:00
Thomas S Hatch
a1423b974b
Merge pull request #7777 from shadowfax-chc/develop
...
Ported gitfs cache fixes from #7749 into hgfs. refs #3665 .
2013-10-11 19:56:39 -07:00
David\ Beitey
39627de927
Fix minor typo in state logging
2013-10-12 12:48:45 +10:00
Joseph Hall
6a9752cdb1
Condense df sanitization
2013-10-11 20:24:28 -06:00
shadowfax-chc
a3b91e8125
Ported gitfs cache fixes from #7749 into hgfs. refs #3665 .
2013-10-11 22:15:05 -04:00
Thomas S Hatch
aca78f3144
Merge pull request #7776 from techhat/cmdinjection
...
Fix command injection flaw in disk.inodeusage
2013-10-11 18:50:46 -07:00
Joseph Hall
8e5afe59ce
Fix command injection flaw in disk.inodeusage
2013-10-11 19:43:14 -06:00
Thomas S Hatch
336ebcc2f2
Merge pull request #7771 from cachedout/develop
...
Adding some color to sys.doc
2013-10-11 18:41:39 -07:00
Thomas S Hatch
ef95a2fc89
Merge pull request #7770 from basepi/minepillar7197
...
Remove pillar matching for mine.get
2013-10-11 18:38:43 -07:00
Thomas S Hatch
6d8ef68b60
Merge pull request #7774 from techhat/cmdinjection
...
Fix command injection vulnerability in disk.usage
2013-10-11 18:37:50 -07:00
Joseph Hall
7f190ff890
It is better to die(), than to return falsely.
2013-10-11 19:31:11 -06:00
Joseph Hall
ebdef37b7e
Fix command injection vulnerability in disk.usage
2013-10-11 19:18:56 -06:00
Thomas S Hatch
b89fa91358
Drop suplimetary groups when running an non-root user
2013-10-11 16:53:38 -06:00
Thomas S Hatch
615f00580e
single quotes
2013-10-11 16:48:26 -06:00
Thomas S Hatch
339b0a51be
Fix yaml.load refs
...
These are not really security issues because Salt parses all
incomming arguments via yaml.safe_load before they get here, these
really are not needed. I kept the yaml check in for pillar.ext
simply because we want to be able to support an internal application
firing the routine with a yaml sting.
2013-10-11 16:44:31 -06:00
Mike Place
5caad7a5b8
Cosmetic adjustment to add some color to the output of sys.doc.
2013-10-11 16:36:15 -06:00
Pedro Algarvio
544d6b02be
Fix .PHONY target
2013-10-11 23:26:15 +01:00
Colton Myers
481984739a
Remove pillar matching for mine.get
2013-10-11 16:24:38 -06:00
Pedro Algarvio
aa25f2f67b
Add the translatable files for the zh_CN translation.
2013-10-11 23:24:15 +01:00
Pedro Algarvio
3cd0ac8642
Add support for other documentation languages.
2013-10-11 23:23:17 +01:00
Mike Place
9f8307b065
Merge branch 'develop' of https://github.com/saltstack/salt into develop
...
* 'develop' of https://github.com/saltstack/salt : (193 commits)
Docstring fixes
Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars
Expand the `pip` library requirement.
mention LocalClient.cmd "kwarg" argument in docs
Added undocumented ssh roster configuration options
Explain why the pip state needs a pip module importable. Refs #7659 .
except right exception that file module raised
Prettify subcommand to kill minions
Removed special case for uppercase attributes from Mock object
Updated Sphinx makefile for latest Sphinx and i18n additions
[3665] do not persist gitfs cache dir after config change/restart
refer to appropriate class (self) in the Caller docstring
Fixed typo in comment
Fixed typos and bugs in hgfs. Fixes #7687
Restore the pillar[master][file_roots] when returning the pillar
Fix typo
Have the minion actually generate its ID
rm unused imports from states/win_system.py
tomcat module: rm trailing whitespace
rename code:: to code-block::
...
2013-10-11 15:49:50 -06:00
Thomas S Hatch
664a18a61d
Merge pull request #7767 from dlanderson/fix_issue_5951
...
Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars
2013-10-11 14:04:52 -07:00
Pedro Algarvio
9ccf0896b5
Merge pull request #7763 from s0undt3ch/develop
...
Expand the `pip` library requirement.
2013-10-11 13:11:35 -07:00
Joseph Hall
697e280274
Merge pull request #7768 from terminalmage/docs
...
Docstring fixes
2013-10-11 12:45:17 -07:00
Erik Johnson
2b6af60a80
Docstring fixes
...
Corrected wrong variable name and made grammar corrections
2013-10-11 14:36:17 -05:00
David Anderson
ec4475cf30
Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars
2013-10-11 11:53:00 -06:00
Pedro Algarvio
e350325147
Expand the pip library requirement.
2013-10-11 16:27:47 +01:00
Joseph Hall
34a12cf998
Merge pull request #7764 from dangarthwaite/add_all_options_to_ssh_doc
...
Added undocumented ssh roster configuration options
2013-10-11 08:26:21 -07:00
Thomas S Hatch
94509d30e9
Merge pull request #7758 from s0undt3ch/develop
...
Explain why the pip state needs a pip module importable. Refs #7659 .
2013-10-11 08:05:09 -07:00
Thomas S Hatch
98444b8169
Merge pull request #7750 from holmboe/pkill
...
Prettify subcommand to kill minions
2013-10-11 08:04:34 -07:00
Thomas S Hatch
6bc639c6c8
Merge pull request #7749 from mgwilliams/gitfs-purge
...
[3665] do not persist gitfs cache dir after config change/restart
2013-10-11 08:02:56 -07:00
Joseph Hall
882709331b
Merge pull request #7761 from felixhummel/mention-localclient-kwarg
...
mention LocalClient.cmd "kwarg" argument in docs
2013-10-11 08:02:26 -07:00
Thomas S Hatch
f02553bfc5
Merge pull request #7742 from shadowfax-chc/hgfs-tags-issue
...
Hgfs tags issue
2013-10-11 08:01:06 -07:00
Thomas S Hatch
ee3c979595
Merge pull request #7741 from dlanderson/fix_issue_5449
...
Restore the pillar[master][file_roots] when returning the pillar
2013-10-11 08:00:44 -07:00
Felix Hummel
0aacc8451b
mention LocalClient.cmd "kwarg" argument in docs
2013-10-11 16:29:45 +02:00
Pedro Algarvio
22e22b93f7
Merge pull request #7753 from hvnsweeting/fix_file_state
...
except right exception that file module raised
2013-10-11 07:23:36 -07:00
Dan Garthwaite
a48a8deec2
Added undocumented ssh roster configuration options
2013-10-11 10:21:52 -04:00
